Can you revert the whitespaces changes as it makes merging more difficult in case of a conflict.