revert to 3rd commit 2
remove conflict comments