Conflicts:core/config.mk