merge
dispose error fix
merge 2