fix for Makefile endif missing merge error