comments now merging properly