Updating prepare-commit-msg to allow for branch merges