Fixed merge resolution with origin