String output complete
Fix merge
EVERYTHING IS DONE