Fix syntax error in bower.json due to merge devel