before even thinking about merging, be sure to get rid of comments