tipo can be null
fixed conflics