clone a new dir add kill_process makefile.commons
modify in new git clone, forget merge conflict