Please resolve the conflict

please