fixed DTASSI
merged conflicts