Whitespace and small merge remnant