merge
patchup bad commit from cilkplus in makefile