Cleanup merge conflict, revert bootstrap.css changes