merge-tree: remove unused df_conflict arguments