update txt3
update txt4
solve merge conflict