Fix remaining merge comments.