fixed trackpri
conflict fixed