fix build
Conflicts:
	core/Makefile