Resolved the conflict