cleaning
Merge branch 'master' of https://github.com/vogatt/mc-fast-merge-consensus