Merge whitespace fix