worked on nodemove
conflict res