Merge conflicts

ID: git-tips/merge-conflicts

New to topics? Read the docs here!