Can you rebase against master?  The bower.json file has changed since your fork.