diff --git a/test.py b/test.py
index e8579b9f..9c9bfab5 100644
--- a/test.py
+++ b/test.py
@@ -4,6 +4,7 @@
 import unittest
 from unittest.mock import Mock, patch
 
+<<<<<<< HEAD
 from shared_utils import (
     InstrDict,
     check_arg_lut,
@@ -23,6 +24,9 @@
     update_encoding_for_fixed_range,
     validate_bit_range,
 )
+=======
+from shared_utils import *
+>>>>>>> f8f8dc6 (Add Unit Tests for shared_utils.py (#309))
 
 
 class EncodingUtilsTest(unittest.TestCase):