diff --git a/setup.cfg b/setup.cfg
index 80c75344f..69c1ec577 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,6 +75,7 @@ style =
     pre-commit
 testing =
     idyntree >= 12.2.1
+    networkx
     pytest >=6.0
     pytest-icdiff
     robot-descriptions
diff --git a/tests/conftest.py b/tests/conftest.py
index b197d59b2..f31da7f3f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -193,16 +193,9 @@ def jaxsim_model_ergocub() -> js.model.JaxSimModel:
         )
     )
 
-<<<<<<< HEAD
     os.environ["GAZEBO_MODEL_PATH"] = os.environ.get(
         "GAZEBO_MODEL_PATH", ""
     ) + ":".join(get_package_dirs(robot_descriptions.ergocub_description))
-=======
-    os.environ["GAZEBO_MODEL_PATH"] = (
-        os.environ.get("GAZEBO_MODEL_PATH", "")
-        + f":{get_package_dirs(robot_descriptions.ergocub_description)}"
-    )
->>>>>>> 4f96412 (Use already existing env var to solve mesh URIs)
 
     return build_jaxsim_model(model_description=model_urdf_path)
 
@@ -252,16 +245,9 @@ def jaxsim_model_ur10() -> js.model.JaxSimModel:
 
     model_urdf_path = pathlib.Path(robot_descriptions.ur10_description.URDF_PATH)
 
-<<<<<<< HEAD
     os.environ["GAZEBO_MODEL_PATH"] = os.environ.get(
         "GAZEBO_MODEL_PATH", ""
     ) + ":".join(get_package_dirs(robot_descriptions.ur10_description))
-=======
-    os.environ["GAZEBO_MODEL_PATH"] = (
-        os.environ.get("GAZEBO_MODEL_PATH", "")
-        + f":{get_package_dirs(robot_descriptions.ur10_description)}"
-    )
->>>>>>> 4f96412 (Use already existing env var to solve mesh URIs)
 
     return build_jaxsim_model(model_description=model_urdf_path)