diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
index 3ed06429834ae53314ed984f21b2b35a306b596a..76c1c1991b311d6cd7f8dc1c94dfac439753a50f 100644
--- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
@@ -102,18 +102,9 @@
     "from cal_tools.enums import BadPixels, JungfrauGainMode\n",
     "from cal_tools.jungfrau import jungfraulib\n",
     "from cal_tools.restful_config import (\n",
-<<<<<<< HEAD
     "    extra_calibration_client,\n",
     ")\n",
     "from cal_tools.tools import calcat_creation_time, pdus_by_detector_id\n",
-=======
-    "    calibration_client,\n",
-    "    extra_calibration_client,\n",
-    ")\n",
-    "from cal_tools.tools import calcat_creation_time\n",
-    "\n",
-    "warnings.filterwarnings('ignore')\n",
->>>>>>> a4ce232f (fix: small fixes after testing part of injecting ccvs)
     "\n",
     "matplotlib.use('agg')\n",
     "%matplotlib inline"
diff --git a/src/cal_tools/constants.py b/src/cal_tools/constants.py
index 042d6bc793a3436eec9feeadb24cc221fdf74571..8aed18f32965d64afcb002b74280ed548308b6bf 100644
--- a/src/cal_tools/constants.py
+++ b/src/cal_tools/constants.py
@@ -1,10 +1,21 @@
+<<<<<<< HEAD
 import binascii
 import time
+=======
+
+import binascii
+import time
+import warnings
+from datetime import datetime, timezone
+>>>>>>> 055e516a (fix: handle CCVAlreadyInject case using a warning)
 from hashlib import md5
 from pathlib import Path
 from shutil import copyfile
 from struct import pack, unpack
+<<<<<<< HEAD
 from typing import List, Optional, Union
+=======
+>>>>>>> 055e516a (fix: handle CCVAlreadyInject case using a warning)
 
 import h5py
 import numpy as np
@@ -15,6 +26,12 @@ from cal_tools.calcat_interface2 import (
     get_default_caldb_root,
 )
 from cal_tools.restful_config import calibration_client
+from cal_tools.tools import run_prop_seq_from_path
+
+
+class CCVAlreadyInjected(UserWarning):
+    """Exception when same CCV was already injected."""
+    pass
 
 CONDITION_NAME_MAX_LENGTH = 60