Makefile sorted

Zia sorted Makefile conflict issues