diff --git a/context_test.go b/context_test.go
index e44fddab..3ccb2a8a 100644
--- a/context_test.go
+++ b/context_test.go
@@ -631,7 +631,11 @@ func TestContextAbortWithStatus(t *testing.T) {
 func TestContextAbortWithStatusJSON(t *testing.T) {
 	w := httptest.NewRecorder()
 	c, _ := CreateTestContext(w)
+<<<<<<< HEAD
 
+=======
+	
+>>>>>>> d08400d4d4a552c9521b7e5379d79b18a409694e
 	c.index = 4
 	type inboundJsonType struct {
 		Foo string `json:"foo"`