diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
index 207d0142c..0b4cf371c 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
@@ -186,7 +186,11 @@ public class JSONInterceptor extends AbstractInterceptor {
 
             return Action.NONE;
         } else {
+<<<<<<< HEAD
             LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", accept);
+=======
+            LOG.debug("Accept header parameter must be 'application/json' or 'application/json-rpc'. Ignoring request with accept ", contentType);
+>>>>>>> fab687a07e8d873c82465b29188100debf61097f
         }
 
         return invocation.invoke();