Fixed up bower option merge