fixed merger conflict in bower.json