form indikator min
fix conflict