remove conflict in comments