tree visitator stored now line number
Fixed conflits