done with goal tracking
after fix conflict