pull
fixed conflict
add Style for sing in
Style Device