Update Test 2.txt

test conflict code