fix up merge issues