Update a.txt
last update
Update a.txt
ss
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	a.txt
sdfsd
Update a.txt
asdf
Merge remote-tracking branch 'origin/branch1' into branch1

Conflicts:
	a.txt
Merge branch 'master' into branch1
Merge pull request #2 from sxffff/branch2

Branch2