solving
resolving the conflict