conflict edit and autofilter bug fixed