fix conflicts in bower + fix typo