Update today's outline
Fixed merge conflicts