app.socialtables.com git:(ko-svg) ✗ git merge development
Auto-merging static/assets/images/table-icons.png
CONFLICT (rename/delete): static/assets/images/loading.gif deleted in development and renamed in HEAD. Version HEAD of static/assets/images/loading.gif left in tree.
Auto-merging static/assets/images/icon_settings.png
Auto-merging static/assets/images/floorplan_icons/SocialTables_Floorplan-Icons-Staff.png
CONFLICT (rename/delete): static/assets/images/asfalt_pattern.png deleted in development and renamed in HEAD. Version HEAD of static/assets/images/asfalt_pattern.png left in tree.
Auto-merging server.js
Auto-merging public/index.html
CONFLICT (content): Merge conflict in public/index.html
Removing public/documents/empty.txt
Auto-merging public/assets/ko-templates/ko-settings-venue.html
Auto-merging public/assets/ko-templates/ko-header.html
CONFLICT (add/add): Merge conflict in public/assets/ko-templates/ko-header.html
Auto-merging public/assets/ko-templates/ko-footer.html
CONFLICT (content): Merge conflict in public/assets/ko-templates/ko-footer.html
Auto-merging public/assets/js/models/viewmodel.js
CONFLICT (content): Merge conflict in public/assets/js/models/viewmodel.js
Auto-merging public/assets/js/models/guest.js
CONFLICT (content): Merge conflict in public/assets/js/models/guest.js
Auto-merging public/assets/js/models/glm.js
CONFLICT (content): Merge conflict in public/assets/js/models/glm.js
Auto-merging public/assets/js/models/event.js
Auto-merging public/assets/js/models/editDialog.js
CONFLICT (content): Merge conflict in public/assets/js/models/editDialog.js
Auto-merging public/assets/js/models/dnd.js
CONFLICT (content): Merge conflict in public/assets/js/models/dnd.js
Auto-merging public/assets/js/main/main.js
CONFLICT (content): Merge conflict in public/assets/js/main/main.js
Auto-merging public/assets/js/helper/scripts.js
CONFLICT (content): Merge conflict in public/assets/js/helper/scripts.js
Auto-merging public/assets/js/helper/helper.js
Auto-merging less/base.less
CONFLICT (content): Merge conflict in less/base.less
CONFLICT (modify/delete): dust/room-guest.svg.dust deleted in HEAD and modified in development. Version development of dust/room-guest.svg.dust left in tree.
CONFLICT (modify/delete): dust/left-guest-tags.dust deleted in HEAD and modified in development. Version development of dust/left-guest-tags.dust left in tree.
CONFLICT (modify/delete): dust/left-guest-guests.dust deleted in HEAD and modified in development. Version development of dust/left-guest-guests.dust left in tree.
CONFLICT (modify/delete): dust/left-floor.dust deleted in HEAD and modified in development. Version development of dust/left-floor.dust left in tree.
CONFLICT (modify/delete): dust/glm.dust deleted in HEAD and modified in development. Version development of dust/glm.dust left in tree.
Automatic merge failed; fix conflicts and then commit the result.
➜  app.socialtables.com git:(ko-svg) ✗