makefile config.h removed
merge