uređivan bootstrap
conflict