Fixed bad merge resolution