diff --git a/README.md b/README.md
index 49753394..fd6cc405 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ git.osc地址：http://git.oschina.net/xuxueli0323/xxl-job
 	8、支持自定义参数；
 	9、支持任务失败次数超阈值邮件报警；
 	10、支持在线查看，执行器详细日志；
+	11、支持远程任务执行终止；
 
 # 新版本 V1.2.x，新特性
 	1、支持任务分组；
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 2c248806..72cb65a3 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,7 +196,11 @@ $(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-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java b/xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java
index 611596e6..56f709ec 100644
--- a/xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java
+++ b/xxl-job-client-demo/src/main/java/com/xxl/job/service/handler/DemoJobHandler.java
@@ -24,7 +24,11 @@ public class DemoJobHandler extends IJobHandler {
 	@Override
 	public JobHandleStatus handle(String... params) throws Exception {
 		logger.info(" ... params:" + params);
+<<<<<<< HEAD
 		for (int i = 0; i < 60; i++) {
+=======
+		for (int i = 0; i < 10; i++) {
+>>>>>>> branch 'master' of https://github.com/xuxueli/xxl-job.git
 			TimeUnit.SECONDS.sleep(1);
 			logger.info("handler run:{}", i);
 		}