Update test2.txt

rr1
conflict solved
problem with conflict