Click View History, Revert to an older version, get conflict dialog confusingly.
Closed by commit rP3c8d88deb454.