After the Merge

First Draft of a merge version