add file2.txt
update file2.txt: test 1
dev 分支修改 file1.txt
Merge branch 'dev'

Conflicts:
	file1.txt
已修復 file1.txt 合併衝突