Merged all the conflicts.
Blurb.