FD3-576 fix conflictos

src/CablemodemBundle/Entity/Cablemodem.php

@@ -485,7 +485,6 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
         return $this->cpeFixedIP;
     }
     
-<<<<<<< HEAD
     /**
      * @param boolean $cpeFixedIP
      *