Resolve conflicts in bower.json