Resolved Makefile conflict