Makefile: fix conflict