Conflict resolution
Removed suo file
Commiting pull