makefiles were not merged?