Fix bower conflicts