commit 4
Merge https://github.com/binarman/conflicttest