Commit to local feature branch (cont.)
Merge branch 'new_feature_branch'

Conflicts:
	NEW_FEATURE