Fix Bad merge resolution