#test2

creat conflict for the same files in the origin and local

Test

---

This is a test repostory to learn how to use Githut uploading funtion.
The file is about learning git.

This is a hyperlink

git add .   

#test #xyz #1234