removing usort components from third-party and Makefile
removing usort components from third-party and Makefile
updating unmerged files