It would be better to remove the extra empty lines (not only because of Git merging heuristics).