added git-resolve-conflicts.sh