Weird merge conflict blurp.
Updated summary for day 2.