Fix merge conflict: MyAccount