fixed edit profile
resolved conflicts