makefile changes
merge