Use unified_merge for datasets merging

pyzebra/__init__.py

@@ -3,7 +3,7 @@ from pyzebra.ccl_findpeaks import ccl_findpeaks
 from pyzebra.fit2 import fitccl
 from pyzebra.h5 import *
 from pyzebra.ccl_io import load_1D, parse_1D, export_comm
-from pyzebra.param_study_moduls import add_dict, auto, merge, scan_dict
+from pyzebra.merge_function import unified_merge
 from pyzebra.xtal import *
 
 __version__ = "0.1.3"

pyzebra/app/panel_ccl_integrate.py

@@ -126,9 +126,7 @@ def create():
             _, ext = os.path.splitext(append_upload_button.filename)
             append_data = pyzebra.parse_1D(file, ext)
 
-        added = pyzebra.add_dict(det_data, append_data)
-        scan_result = pyzebra.auto(pyzebra.scan_dict(added))
-        det_data = pyzebra.merge(added, added, scan_result)
+        pyzebra.unified_merge(det_data, append_data)
 
         _init_datatable()