add 6.txt
fix conflict