end of first sprint, merge test0 and test1