Fix conflict with core files