fix diff in makefile
start changes
reformat
reformat 2