diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 11a8504be3e2b3c3c8c3ab1cc8c5db5db63ddbee..eb26d24b2c4e40ce1222c04a54a58b82c0f0db2c 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -110,12 +110,9 @@ ipv4:
       rennes roazhon11 eth0 0 0 14 36
       rennes roazhon12 eth0 0 0 14 39
       rennes roazhon13 eth0 0 0 14 44
-<<<<<<< HEAD
-=======
       sophia uvb eth0 0 0 4 0
       sophia uvb ib0 0 0 4 0
       sophia esterel31 eth0 0 0 3 40
->>>>>>> 6eaab2f5e9 ([ipv4.yaml] add existing IB networks)
       sophia mercantour1 eth0 0 0 2 0
       sophia mercantour2 eth0 0 0 2 16
       sophia mercantour2 ib0  0 0 2 16
@@ -165,6 +162,7 @@ ipv4:
       sophia esterel39 eth0 0 0 3 52
       sophia esterel40 eth0 0 0 3 53
       sophia esterel41 eth0 0 0 3 55
+      sophia esterel41 ibs3 0 0 3 55
       sophia musa eth0 0 0 5 0
       sophia uvb eth0 0 0 4 0
       strasbourg fleckenstein eth0 0 0 0 0