[DONE] merge in edit user