Added git-conflicts script.wq