Added a comment.
Add another different comment.
Merge branch 'merge_conflict'

Conflicts:
	first-file.js