update makefile
correct conflit