diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
index 72cb65a382ac5e32c82c13499b9716447737d791..2c24880607de3c07a0321bf6becf91d51efd3805 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -196,11 +196,7 @@ $(function() {
 		ComConfirm.show("确认主动终止任务?", function(){
 			$.ajax({
 				type : 'POST',
-<<<<<<< HEAD
 				url : base_url + 'joblog/logKill',
-=======
-				url : base_url + 'joblog/ferrariJobKill',
->>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
 				data : {"id":_id},
 				dataType : "json",
 				success : function(data){
diff --git a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
index f8babda0660cd5c8cafb57b74debf064b1cc2068..82412fd9a12b51affb16b49173d317eacc17d1e7 100644
--- a/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
+++ b/xxl-job-client/src/main/java/com/xxl/job/client/handler/HandlerThread.java
@@ -97,7 +97,7 @@ public class HandlerThread extends Thread{
 					} catch (Exception e) {
 						logger.info("HandlerThread Exception:", e);
 					}
-					logger.info("<<<<<<<<<<< xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}", 
+					logger.info(">>>>>>>>>>> xxl-job thread handle, handlerData:{}, callback_status:{}, callback_msg:{}, callback:{}, thread:{}", 
 							new Object[]{handlerData, _status, _msg, callback, this});
 				} else {
 					i++;