manual merge  of boot strap -> project admin