took out merge conflict in user#edit