make sure you leave no end of line white space. Once you rebase you can run `grunt` in the project root to have all the files checked for problems.