0 / 60 seg.

User A must decide for the conflicts which version to keep, " Keep Mine " or " Keep Other ".