FIX: improved error logging during merge to help debug
FIX: improved error logging during merge to help debug

Former-commit-id: b7433dc72c00fefe82913896f7976593fcc3e26d
webgme/webgme-engine,webgme/webgme-engine,webgme/webgme-engine