https://frezc.github.io/2018/04/30/how-to-fix-wrong-merge/
https://frezc.github.io/2018/04/30/how-to-fix-wrong-merge/