Added bower resolution for conflicts