removed merge conflict on user profile page