Switch to Bootstrap.
Resolve merge conflicts.