Changed a print statement to something else
Fixed conflict that occurred