merge with latest makefile