importing bootstrap
fixing merges