merge on unison conflict
no good merge from current