Attempt to fix whitespace issues for merge diff