core/merge: Fix resolveConflictAsync(... was) type anotation
core/merge: Fix resolveConflictAsync(... was) type anotation

Existing doc is only used for logging purpose.
And it is actually `was &&` prefixed in production code.
Maybe it should be actually removed completely

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