diff --git a/docs/faq.rst b/docs/faq.rst
index 7bef86967e25069fca304b2522077c647847e6d5..ab6257d21db7defba8599d67cdfa57fc2378f2f9 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -65,7 +65,6 @@ FAQ
    $ echo 'LANG=zh_CN.UTF-8' > /etc/sysconfig/i18n
 
 
-<<<<<<< HEAD
 6. 运行 sh make_migrations.sh 报错，
    CommandError: Conflicting migrations detected; multiple ... django_celery_beat ...
    这是由于 django-celery-beat老版本有bug引起的
@@ -75,8 +74,9 @@ FAQ
    $ rm -rf /opt/py3/lib/python3.6/site-packages/django_celery_beat/migrations/
    $ pip uninstall django-celery-beat
    $ pip install django-celery-beat
-=======
-6. 连接测试常见错误
+
+
+7. 连接测试常见错误
 
 ::
 
@@ -100,5 +100,4 @@ FAQ
 
    (4). "MODULE FAILURE","module_stdout":"/bin/sh: 1: /usr/bin/python: not found\r\n","module_stderr":"Shared connection to xx.xx.xx.xx closed.\r\n"
 
-       # 一般是资产 python 未安装或者 python 异常，此问题多发生在 ubuntu 资产上
->>>>>>> github/docs
+       # 一般是资产 python 未安装或者 python 异常，此问题多发生在 ubuntu 资产上
\ No newline at end of file