Another exciting pull request

Conflict resolution example