merge fix for makefile