Fixed comments not merging