Resolving conflict in bower.json
Fixng break