Fix bower install conflicts