fix up merge error