merge-tree: fix d/f conflicts