Fixed a trailing space and spurious comment from merge