fix time
fix model conflito erro