Added bootstrap script
Fix conflict