merge: grammofix in please-commit-before-merge message