Resolve conflict i Bower.json