diff --git a/vppcfg/vpp/vppapi.py b/vppcfg/vpp/vppapi.py
index e0d3de2..1103807 100644
--- a/vppcfg/vpp/vppapi.py
+++ b/vppcfg/vpp/vppapi.py
@@ -409,6 +409,8 @@ class VPPApi:
         except AttributeError:
             self.logger.warning(f"ACL API not found - missing plugin: {err}")
 
+=======
+>>>>>>> 0cf4473 (Set MPLS for loopback and interface. Allow for --novpp and VPP changes)
         self.logger.debug("Retrieving bondethernets")
         api_response = self.vpp.api.sw_bond_interface_dump()
         for iface in api_response: