more fixing up merge issues