merge: Dissociate doc from remote instead of deleting it on conflicting changes
merge: Dissociate doc from remote instead of deleting it on conflicting changes

cozy-labs/cozy-desktop,nono/cozy-desktop,cozy-labs/cozy-desktop,nono/cozy-desktop,cozy-labs/cozy-desktop,nono/cozy-desktop,cozy-labs/cozy-desktop,nono/cozy-desktop