upgrade bootstrap
resolving conflicts