Fix merge resolution