Remove conflict markers from Makefile

Reported-by: Leho Kraav <leho@kraav.com>