Merge and comment all the things you don't want to comment!