fix merge conflicts

src/FTTHBundle/Admin/ONUAdmin.php

@@ -281,6 +281,8 @@ class ONUAdmin extends WorkflowBaseAdmin
                             'readonly' => $readonly,
                         ],
                     ])
+                    ->add('trafficProfileIn')
+                    ->add('trafficProfileOut')
                 ->end()
                 ->with('Huawei', ['class' => "col-md-12 {$hidden['Huawei']} olt_mark Huawei"])
                     ->add('servicePorts', CollectionType::class, array(