for all dispose
confilic
resolve conflict
modify list's bug
merge