bootstrap / ang-strap conflict revert