Fixes Makefile to avoid conflicts