resolved conflict in myaccount