Merge branch 'main' of github.com:quecpython/wiki into main

Author: rivern yuan

en-us/_sidebar.md

@@ -1,5 +1,6 @@
 <!-- docs/_sidebar.md -->
 
+<<<<<<< HEAD
 * [Video tutorial](https://space.bilibili.com/491326023/channel/detail?cid=150963)
 * [Python Basis](/en-us/python/)
 * [python attributes](/en-us/api/pythonBasic.md)
@@ -9,4 +10,13 @@
 * [QuecPython FAQ](/en-us/faq/)
 * [**Official Website**](//python.quectel.com)
 * [**Official Doc**](//python.quectel.com/doc/en/)
-* [**Download**](//python.quectel.com/down.html)
+* [**Download**](//python.quectel.com/down.html)
+=======
+* [**Video Tutorial**](https://space.bilibili.com/491326023/channel/detail?cid=150963)
+* [**Python Basis**](/en-us/python/)
+* [**QuecPython API**](/en-us/api/)
+* [**QuecPython FAQ**](/en-us/faq/)
+* [**Wiki HomePage**](/en-us/)
+* [**Official Website**](//qpy.quectel.com)
+* [**Download**](//qpy.quectel.com/down.html)
+>>>>>>> 75e5e253e5983c47d62ac41be0a9da7ef8626bbc