Changing new_file.md
Another change in the new branch
Merge branch 'new_branch'

Conflicts:
	index.md