diff --git a/measprocess/plotting.py b/measprocess/plotting.py
index c84953b10aa60134f717a81a4a41eccd1a2a29a2..81fa5ae8a17aa2a8b3d89c3b09822799ff378c51 100644
--- a/measprocess/plotting.py
+++ b/measprocess/plotting.py
@@ -18,6 +18,13 @@ def plot_series_osm(gps_series : gpd.GeoSeries, c_series : np.ndarray = None, zo
     if gps_series.crs != "EPSG:4326":
         raise ValueError("Make sure to pass data with EPSG:4326 projection")
 
+<<<<<<< HEAD
+=======
+    '''
+    Make a very simple test
+    '''
+
+>>>>>>> acf279e246eb4d95cc291cda8b61e11cd7773375
     request = cimgt.OSM()
     extent = gps_series.total_bounds[[0, 2, 1, 3]]
     plt.figure(figsize=fig_size)