moving square by square
merge conflicts