asdasd as as s s s s s s ss s s s
Merge remote-tracking branch 'origin/master'

Conflicts:
	c.txt
asdasd as as s s s s s s ss s s s
Merge remote-tracking branch 'origin/master'

Conflicts:
	d.txt
asdasd as as s s s s s s ss s s s