added comment merging feature...will it pass?