fix a broken test

Signed-off-by: DONNOT Benjamin <benjamin.donnot@rte-france.com>

Author: BDonnot

grid2op/tests/test_utils.py

@@ -9,10 +9,7 @@
 import copy
 import json
 import os
-<<<<<<< HEAD
 import re
-=======
->>>>>>> dev_1.12.5
 from hashlib import blake2b
 from unittest.mock import patch
 import numpy as np