diff --git a/tencentcloud-captcha/tencentcloud-captcha.php b/tencentcloud-captcha/tencentcloud-captcha.php
index 94cf4f0b5461f60205f3b0570c9672ded5c4d97f..4ff740a66629fd09d01ae8516dd15c336e183f80 100644
--- a/tencentcloud-captcha/tencentcloud-captcha.php
+++ b/tencentcloud-captcha/tencentcloud-captcha.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 /**
  * Plugin Name: tencentcloud-captcha
@@ -86,81 +85,3 @@ add_action( 'comment_form_before', array($TecentWordpressCaptchaActions, 'tencen
 
 //插件中心初始化
 add_action( 'init', array($TecentWordpressCaptchaActions, 'tencentCaptchaInit'));
-=======
-<?php
-/**
- * Plugin Name: tencentcloud-captcha
- * Plugin URI:  https://wordpress.org/plugins/tencentcloud-captcha
- * Description: 通过腾讯云验证码提供立体、全面的人机验证。
- * Version: 1.0.1
- * Author: 腾讯云
- * Author URI: https://www.tencent.com/
- * Copyright (C) 2020 Tencent Cloud.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-define( 'TENCENT_WORDPRESS_CAPTCHA_VERSION', '1.0.1' );
-define( 'TENCENT_WORDPRESS_CAPTCHA_DIR', plugin_dir_path( __FILE__ ) );
-define( 'TENCNET_WORDPRESS_CAPTCHA_BASENAME', plugin_basename(__FILE__) );
-define( 'TENCENT_WORDPRESS_CAPTCHA_JS_DIR', plugins_url( 'tencentcloud-captcha' ) . '/' . 'js' . '/' );
-define( 'TENCENT_WORDPRESS_CAPTCHA_CSS_DIR', plugins_url( 'tencentcloud-captcha' ) . '/' . 'css' . '/' );
-define( 'TENCENT_WORDPRESS_CAPTCHA_NAME', 'tencentcloud-captcha');
-define( 'TENCENT_WORDPRESS_CAPTCHA_SHOW_NAME', 'tencentcloud-captcha');
-defined('TENCENT_WORDPRESS_CAPTCHA_URL') or define('TENCENT_WORDPRESS_CAPTCHA_URL', plugins_url(TENCENT_WORDPRESS_CAPTCHA_NAME) . '/');
-
-defined('TENCENT_WORDPRESS_PLUGINS_COMMON_URL') or define('TENCENT_WORDPRESS_PLUGINS_COMMON_URL', TENCENT_WORDPRESS_CAPTCHA_URL . 'common' . '/');
-defined('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL') or define('TENCENT_WORDPRESS_PLUGINS_COMMON_CSS_URL', TENCENT_WORDPRESS_PLUGINS_COMMON_URL . 'css' . '/');
-defined('TENCENT_WORDPRESS_PLUGINS_COMMON_DIR') or define('TENCENT_WORDPRESS_PLUGINS_COMMON_DIR', TENCENT_WORDPRESS_CAPTCHA_DIR . 'common' . '/');
-
-require_once 'TencentCloudCaptchaActions.php';
-$TecentWordpressCaptchaActions = new TencentCloudCaptchaActions();
-
-register_activation_hook(__FILE__, array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_activatePlugin'));
-register_deactivation_hook(__FILE__, array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_deactivePlugin'));
-
-//添加插件设置页面
-add_action('admin_menu',  array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_pluginSettingPage'));
-// 插件列表加入设置按钮
-add_filter('plugin_action_links', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_pluginSettingPageLinkButton'), 10, 2);
-
-//添加注册表单
-add_action('register_form',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_registerForm'));
-//添加登录表单
-add_action('login_form',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_loginForm'));
-//添加评论表单
-add_filter('comment_form_submit_button',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_commentForm'),10,1);
-//添加忘记密码表单
-add_action('lostpassword_form',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_lostpasswordForm'));
-//添加登录时的钩子
-add_action( 'authenticate', array($TecentWordpressCaptchaActions,'tencent_wordpress_capthca_loginCodeVerify'),101,3);
-//添加注册时验证
-add_action('register_post',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_registerCodeVerify'),10,3);
-//添加忘记密码时验证
-add_action('lostpassword_post',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_lostpasswordCodeVerify'),10);
-//添加评论时验证
-add_action('preprocess_comment',array($TecentWordpressCaptchaActions,'tencent_wordpress_captcha_commentCodeVerify'));
-
-//添加腾讯云验证码配置保存
-add_action('wp_ajax_update_codeVerify_settings', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_updateCaptchaSettings'));
-
-//js脚本引入
-add_action( 'admin_enqueue_scripts', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_loadMyScriptEnqueue'));
-add_action( 'login_enqueue_scripts', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_loadMyScriptEnqueue'));
-add_action( 'wp_enqueue_scripts', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_loadScriptForPage'));
-add_action( 'comment_form_before', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_loadMyScriptEnqueue'));
-
-//插件中心初始化
-add_action( 'init', array($TecentWordpressCaptchaActions, 'tencent_wordpress_captcha_init'));
->>>>>>> 3bf146b4e3ff4b1b651bb082f1c348c28e5eec65