fix for bad merge resolution.