change first line of paragraph
Merge branch 'conflict'

Conflicts:
	lorem-ipsum/lorem.md