Index: tests/dg_nvm_scripts.py
===================================================================
diff -u -rc8987a6a349b95c0543be47345230d5dbaf1cf63 -rbeb4ac595e00597675a43535b934b75650539aef
--- tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision c8987a6a349b95c0543be47345230d5dbaf1cf63)
+++ tests/dg_nvm_scripts.py	(.../dg_nvm_scripts.py)	(revision beb4ac595e00597675a43535b934b75650539aef)
@@ -22,10 +22,7 @@
         # This function requires an address for the excel report. Use the absolute address of your excel report like the
         # example below
         dg.calibration_record.cmd_set_dg_calibration_excel_to_fw('/home/fw/projects/DG_NV_Records/2022-02-10-DG-Record.xlsx')
-<<<<<<< HEAD
-=======
 
         # For resetting the calibration record to benign values, use the function below
         dg.calibration_record.cmd_reset_dg_calibration_record()
->>>>>>> DEN-11750-dg_dev-dg-dialysate-temperature-control-tune-up