silenced weird output
Fixed conflict