fix up merge conflicts to compile on strict settings