Revert all of your whitespace changes. This makes merging projects vastly more difficult.