Finished conflict handling.
Merge branch 'master' of github.com:fazzel09/UCCP