Resolving conflicts when both sides have… • Delphi