Make corrections from a bade merge resolution