merge makefile glitch