move units correctly when two on same square