fix me
Moved bootstrap.
Fixed conflict.