fixed makefile conflicts