update test.txt
add file test2.txt
fix conflicts