fixing conflicts in Makefile