The manuals got conflict markers in them and weren't fixed, how it all still compiled was beyond me.