conflicting commit with aster in 2.txt
nb
nb2
Merge branch 'nb' of https://github.com/EBAdmin/TestRepo

Conflicts:
	2.txt