These files were left behind for some reason
Minor conflict in one line now fixed ¬¬