rename bower name
fix conflicts