aa
Merge branch 'master' of github.com:LDreptate/test
Scenario 3
Merge branch 'master' of github.com:LDreptate/test
scenario 4
Merge branch 'master' of github.com:LDreptate/test

Conflicts:
	a.txt
scenario4