had bower listest twice
pull merge