better deal with the two commit modes
Merge branch 'pr/two-commit-modes'