make/Makefile.in: Resolve merge conflict

Signed-off-by: Oliver Metz <oliver@freetz.org>