merge all the things (scrum 2)