update makefile
resolve merge conflict