409 conflicts are a pain in the ass... I think the document conflicts are solved, the attachment conflicts looks solved