add 6.txt
add comflict 6.txt