how to merge
Merge remote-tracking branch 'origin/new_branch_based_greet' into greet

Conflicts:
	newbranch.txt