Create remove-conflicts.sh