merge conflicts in comments removed