fix bower conflicts