merge conflicts omg
finished page 2