Added bower resolution for versions conflicts