Fixed missed merge confict
Reordering of Makefile source files