Makefile: Fix merge conflict