Master has different contents for `bower.json`. You will need to:

```
git checkout master
git pull origin master
git checkout api_stub
git rebase master
git push -f
```