fixed edit profile
solved conflicts