diff --git a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
index d2d2361..8cd4cf4 100644
--- a/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+++ b/src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
@@ -618,10 +618,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 				jsonStr = KJB_ROOTLESS_ARRAY + jsonStr + "}";
 				responseMessage = jsonStr.getBytes(vo.getEncode());
 			}
-<<<<<<< HEAD
 
-=======
->>>>>>> branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/elink-online-common.git
 
 			return assignResponseHeaders(method, responseMessage, headerGroupName, vo.getEncode(), messageType,
 					relayResponseHeaderKeys, status, responseHeaderProp);