OK. On one hand the style guide says one should save vertical spacing whenever possible, on the other hand the code checker says no error. 
The merge issue was because the changes span multiple merges and that's how git handles. The alternative would be to remove the PR, do the whole thing in a new branch from the current head, but I prefer keeping the original.