update background
update move method
conflict