Pretty pretty printing
Removed output.txt
Fixed conflict