diff --git a/docs/content/contributing/2-local-testing.md b/docs/content/contributing/2-local-testing.md
index d8052c82..a6e229c3 100644
--- a/docs/content/contributing/2-local-testing.md
+++ b/docs/content/contributing/2-local-testing.md
@@ -222,8 +222,6 @@ $actual = graphql( array( 'query' => $query ) );
 
 ## Run test expecting success
 
-<<<<<<< HEAD
 # Going Forward
-=======
 ## Writing your first test
->>>>>>> Update docs/content/contributing/2-local-testing.md
+