Added .suo file to .gitignore
Resolving local conflicts
merge conflicts