Draft of "conflict unwinding" - patches may be edited