Remove bad merge from Makefile