loca1 changed test1.txt
resolved conflit and changed test1.txt