Update test2.txt

rr2
conflict solved
problem with conflict