few new changes

Conflicts:
	first.txt
hi name nisnah