Daniel-Maldonados-MacBook-Pro:webgui daniel$ git pull https://github.com/plainblack/webgui
From https://github.com/plainblack/webgui
 * branch            HEAD       -> FETCH_HEAD
Auto-merging selenium/README
CONFLICT (add/add): Merge conflict in selenium/README
Auto-merging selenium/adminConsole.html
CONFLICT (add/add): Merge conflict in selenium/adminConsole.html
Auto-merging selenium/assetHelpers.html
CONFLICT (add/add): Merge conflict in selenium/assetHelpers.html
Auto-merging selenium/clipboard.html
CONFLICT (add/add): Merge conflict in selenium/clipboard.html
Auto-merging selenium/login.html
CONFLICT (add/add): Merge conflict in selenium/login.html
Auto-merging selenium/logout.html
CONFLICT (add/add): Merge conflict in selenium/logout.html
Auto-merging selenium/newContentBasic.html
CONFLICT (add/add): Merge conflict in selenium/newContentBasic.html
Auto-merging selenium/newContentCommunity.html
CONFLICT (add/add): Merge conflict in selenium/newContentCommunity.html
Auto-merging selenium/newContentIntranet.html
CONFLICT (add/add): Merge conflict in selenium/newContentIntranet.html
Auto-merging selenium/newContentPrototypes.html
CONFLICT (add/add): Merge conflict in selenium/newContentPrototypes.html
Auto-merging selenium/newContentShop.html
CONFLICT (add/add): Merge conflict in selenium/newContentShop.html
Auto-merging selenium/newContentUtilities.html
CONFLICT (add/add): Merge conflict in selenium/newContentUtilities.html
Auto-merging selenium/turnOnAdmin.html
CONFLICT (add/add): Merge conflict in selenium/turnOnAdmin.html
Auto-merging selenium/versionTags.html
CONFLICT (add/add): Merge conflict in selenium/versionTags.html
Removing www/uploads/23/46/2346f7d68f56e7cc06094d9fd76f7a88/thumb-bg.gif
Removing www/uploads/5d/07/5d0743a8392bf27b3c1b42a06f30ed25/thumb-tableft.gif
Automatic merge failed; fix conflicts and then commit the result.