Removed line breaks
change this todo 5
Intentionally added something to create conflict
Merge branch 'bug-fix1'

Conflicts:
	todo