Makefile change
merge makefile