2
Merge branch 'new_branch2' into new_branch

Conflicts:
	lalalalla