Makefile: fix conflict resolution