modified makefile to allow compiler changing
fixed conflict