nothing really
Merge resolution