Remixing the afternoon
Resolving merged edits