Changes in the ViewController Class
changes for the old Conflict Library
Removed Conflicts
Remained files to commit
Conflicts Resolved
Conflicts