loca2 changed test2.txt
merge of test2.txt conflit resolved