Fixing merge issue to bootstrap