changed user page
fixed conflict