Fixed merge inserting whitespaces into Makefile