More merge mining

the two most important files