creating and editing graphmaps seems to work pretty well now, though you still can't edit the actual contents, only the meta-data
trying to fix merge conflict
completed merge by accepting local version of database files