Conflict resolution tool

ID: git-tips/conflict-resolution-tool

New to topics? Read the docs here!