Pull Merge Conflicts In Gitar