take out the merge comments