You seem to be quite a few commits behind the upstream. Please fetch the latest, rebase your work on top and (force) push.