fixing bug in Makefile
fixing conflict