working on adding CORS support, need to test
fixing automerge