fix conflicts

develop/dev-guide-insert-data.md

@@ -220,13 +220,8 @@ For complete examples in Python, see:
 
 - [Connect to TiDB with PyMySQL](/develop/dev-guide-sample-application-python-pymysql.md)
 - [Connect to TiDB with mysqlclient](https://github.com/tidb-samples/tidb-python-mysqlclient-quickstart)
-<<<<<<< HEAD
-- [Use MySQL Connector/Python to build a simple CRUD app with TiDB and Python](/develop/dev-guide-sample-application-python-mysql-connector.md#step-2-get-the-code)
-- [Use SQLAlchemy to build a simple CRUD app with TiDB and Python](/develop/dev-guide-sample-application-python-sqlalchemy.md#step-2-get-the-code)
-=======
 - [Connect to TiDB with MySQL Connector/Python](/develop/dev-guide-sample-application-python-mysql-connector.md)
 - [Connect to TiDB with SQLAlchemy](/develop/dev-guide-sample-application-python-sqlalchemy.md)
->>>>>>> 08af194ac6 (develop: refactor SQLAlchemy dev guide (#14638))
 - [Use peewee to build a simple CRUD app with TiDB and Python](/develop/dev-guide-sample-application-python-peewee.md#step-2-get-the-code)
 
 </div>

develop/dev-guide-sample-application-python-sqlalchemy.md

@@ -1,13 +1,7 @@
 ---
-<<<<<<< HEAD
-title: Build a Simple CRUD App with TiDB and SQLAlchemy
-summary: Learn how to build a simple CRUD application with TiDB and SQLAlchemy.
-aliases: ['/tidb/v6.5/dev-guide-outdated-for-sqlalchemy']
-=======
 title: Connect to TiDB with SQLAlchemy
 summary: Learn how to connect to TiDB using SQLAlchemy. This tutorial gives Python sample code snippets that work with TiDB using SQLAlchemy.
-aliases: ['/tidb/dev/dev-guide-outdated-for-sqlalchemy']
->>>>>>> 08af194ac6 (develop: refactor SQLAlchemy dev guide (#14638))
+aliases: ['/tidb/v6.5/dev-guide-outdated-for-sqlalchemy']
 ---
 
 # Connect to TiDB with SQLAlchemy