more makefile
amend
fixed conflicts