WIP
Merge resolution for the two tips