Fixed merge issue in Makefile