clean up make variables
merge