Identify the conflict and show how it can be resolved
