add 3. change 2
resolve merge problem 2.txt
change 1"
Merge remote-tracking branch 'origin/master'