merge conflicts in users/edit view