change user profile CSS
fix merge conflict