core.c : fix up merge conflicts