apply: --3way with add/add conflict