Change name and user name display
Conflict resolution