conflict comments