diff --git a/generators/input/network-equipments.rb b/generators/input/network-equipments.rb
index 12585a5db4593572f115c2c8f1a88cd9f2e2ad02..2e3e995fba8c743a07980578f853f03cede9dc76 100644
--- a/generators/input/network-equipments.rb
+++ b/generators/input/network-equipments.rb
@@ -12,11 +12,15 @@ We need:
 # You can overwrite later on, to add networks, etc.
 %w{lille nancy lyon}.each do |site_uid|
   site site_uid.to_sym do
+<<<<<<< HEAD
 <<<<<<< HEAD
     lookup("#{site_uid}-network-equipments").each do |equipment_uid, properties|
 =======
     lookup("#{site_uid}-network-equipments-transformed").each do |equipment_uid, properties|
 >>>>>>> [admin] Preliminary files for network equipments description.
+=======
+    lookup("#{site_uid}-network-equipments").each do |equipment_uid, properties|
+>>>>>>> [admin] Fixed YAML file name for network equipments.
       network_equipment equipment_uid do |equiment_uid|
         model properties['model']
         mac properties['mac']