This whitespace noise shouldn't be in the PR.  Configure your editor to change all tabs to spaces, to remove all trailing whitespace.