adding dont-commit-conflicts.hks to the list