Normalizing project files from within Visual Studio to make merging less of a nightmare!