fix merge conflict with bower.json