added a second comment line
Merge branch 'feature-set-1'

Conflicts:
	template.pl

Fixed merge conflict