diff --git a/spec/test/features/data/handler/success.feature b/spec/test/features/data/handler/success.feature
index 1101048..aa12587 100644
--- a/spec/test/features/data/handler/success.feature
+++ b/spec/test/features/data/handler/success.feature
@@ -7,7 +7,6 @@ Feature: Retrieve a resource from a handler in Kapow! server.
     Get the "request/path" resource for the current
     request through the handler id.
 
-<<<<<<< HEAD
     Given I have a Kapow! server with the following testing routes:
       | method | url_pattern        |
       | GET    | /listRootDir       |