Fixes bower.json conflict