Update bootstrap asset path
Resolve merge conflicts