We hit a lot of whitespace merge conflicts. It would help greatly if we had an option the add the `ignore-space-change` fag when merging.
And also a preference to make this the default merge behaviour.

git merge -Xignore-space-change feature123