Try again to update to Bootrap 3.2
Fix conflict