The commit needs to be rebased from the head of the master branch. This contains diffs that don't relate to your changes.

Also, you should move your changes to a branch.