Automatic merge conflict resolution

[ofhouse]

The following merge conflict should be solved automatically:

CONFLICT (modify/delete): yarn.lock deleted in HEAD and modified in main. Version main of yarn.lock left in tree.

Desired outcome

• Use the version from main

Proposed solution

• https://stackoverflow.com/a/4969679/831465