On branch master, whoa, commits in parallel omgz
	modified:   hello_world.js
Merge branch 'master' into dev

Conflicts:
	hello_world.js

On branch dev, trying, hopefully, to merge in the master where there was
a same-line merge conflict
	modified:   hello_world.js