remove merge conflict comments #110