Also fix merge to remove extra newline