Update to User registration and edit
Update User Reg and Edit / Merge Resolution