Change to .suo file
Removed debug files from Git
More Git nonsense
More Git nonsense
Resolved conflict