git fail

git it
GUI Score

GUI text
Merge remote-tracking branch 'origin/master'

Conflicts
Git fail

Conflicts:
	Warmyparmy/Warmyparmy-csharp.sln
	Warmyparmy/Warmyparmy.sln