please remove spaces in empty lines, here and for the rest of the file, in order to avoid unneeded merge conflicts when merging