Handle unsaved attachments being passed back from conflict resolover