update prepare-commit-msg for merge situation