Add git-conflicts script