Fix up post-conflict resolution error processing
Fix up post-conflict resolution error processing

// FREEBIE

nrizzio/Signal-Desktop,nrizzio/Signal-Desktop,nrizzio/Signal-Desktop,nrizzio/Signal-Desktop