You did not modify anything but whitespace. This makes merges much more difficult. Please revert this and any other changes in whitespace. We can run a script later to fix all the whitespace in Expertiza.