Fixed strange lines left behind by previous merge