move conflict resolver