resolve conflic

...floodlightcontroller/core/IFloodlightProviderService.java

...va/net/floodlightcontroller/core/internal/Controller.java

...et/floodlightcontroller/devicemanager/IDeviceService.java

...tcontroller/devicemanager/internal/DeviceManagerImpl.java

...ava/net/floodlightcontroller/routing/IRoutingService.java

...floodlightcontroller/servicechaining/BITWServiceNode.java

...htcontroller/servicechaining/IServiceChainingService.java

...et/floodlightcontroller/servicechaining/ServiceChain.java

...net/floodlightcontroller/servicechaining/ServiceNode.java

...a/net/floodlightcontroller/topology/TopologyInstance.java

...va/net/floodlightcontroller/topology/TopologyManager.java

...loodlightcontroller/core/test/MockFloodlightProvider.java