Yesterday's uncommitted edits
Conflicted merges