Fix a minor issue with merged comments being misplaced