diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp
index 7066a0d..5ebd61d 100644
--- a/FlippR-Driver/tests/input/TestEventNotifier.cpp
+++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp
@@ -59,12 +59,8 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no
 
       THEN("The EventHandler gets saved")
       {
-<<<<<<< HEAD
         REQUIRE(*(notifier.event_handlers.find(&event_handler_mock.get())) == &event_handler_mock.get());
         REQUIRE_FALSE(notifier.event_handlers.empty() );
-=======
-        REQUIRE(*notifier.event_handler.begin() == &event_handler_mock.get());
->>>>>>> ddb6d445dd3d61956203a4864797d0b4d17cd277
       }
     }