fix up merge mess