xdl_merge(): fix and simplify conflict handling