missed a merge conflict in config.mk