Add draft of unmerge edges, with TODOs for later improvement