Makefile: fix wrong merge