Fix confluence problems with empty newlines