resolved bower.json merge conflict