exercises pages work with timer and everything
fixed merge conflict