Fixed some more of the printfs to write
Resolved conflicts
Recompiled program