Fix merge conflicts

.gitignore

...in/java/net/floodlightcontroller/core/util/AppCookie.java

...main/java/net/floodlightcontroller/firewall/Firewall.java

.../java/net/floodlightcontroller/forwarding/Forwarding.java

...ntroller/linkdiscovery/internal/LinkDiscoveryManager.java

...va/net/floodlightcontroller/routing/IRoutingDecision.java

...htcontroller/routing/IRoutingDecisionChangedListener.java

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

...ava/net/floodlightcontroller/routing/RoutingDecision.java

...java/net/floodlightcontroller/routing/RoutingManager.java

...ava/net/floodlightcontroller/core/util/AppCookieTest.java

.../java/net/floodlightcontroller/firewall/FirewallTest.java

...a/net/floodlightcontroller/forwarding/ForwardingTest.java