Add 4.txt file on branch master
Change 4.txt file on branch master
First time modify file 4.txt
Second time modify
Update 2.txt
Change file on master to commit in repo folder
resolve conflict when merge