fix flat model conflict