week 2 startup
fixed merge