Combine aborts and conflicts properly.

Catch just newly occuring conflicts after meta/update.