More Visual Studio stuff.

For some reason it's updating something in VS
Merging Files

Git wants me to merge some files