Remove extraneous whitespace, especially in files that you have no other changes in. This only serves to increase merge complexity.