Added back bootstrap files
fixed conflicts