Fix blank lines being removed on merge

Includes a test.