part 3 finished
fixed merge conflicts on one page