Revert "no clue what happened"

This reverts commit 929eb2324d, reversing
changes made to badc482d63.

src/apr.rs

@@ -78,67 +78,8 @@ impl Apr {
         }]; //pawn can move ONE forward, ONCE. not really the best test
         for i in 0..xlen {
             // white side pawns
-<<<<<<< HEAD
-            actors.push(actor::Actor::new(
-                _ctx,
-                "/pawn.png",
-                i,
-                1,
-                behaviours.len() as u8,
-            ));
-            behaviours.push(behaviour::Behaviour::new(
-                vec![(1, 1)],
-                vec![(1, -1), (-1, -1)],
-            ));
-        }
-        for i in 0..=1 {
-            // white side knights
-            actors.push(actor::Actor::new(
-                _ctx,
-                "/pawn.png",
-                i,
-                0,
-                behaviours.len() as u8,
-            ));
-            behaviours.push(behaviour::Behaviour::new(
-                vec![(1, 2)],
-                vec![(1, -1), (-1, -1)],
-            ));
-        }
-        for i in 0..r {
-            // black side pawns
-            actors.push(actor::Actor::new(
-                _ctx,
-                "/pawn2.png",
-                i,
-                c - 2,
-                behaviours.len() as u8,
-            ));
-            behaviours.push(behaviour::Behaviour::new(
-                vec![(1, 1)],
-                vec![(1, 1), (-1, 1)],
-            ));
-        }
-        for i in 0..=1 {
-            // black side knights
-            actors.push(actor::Actor::new(
-                _ctx,
-                "/pawn2.png",
-                i,
-                c - 1,
-                behaviours.len() as u8,
-            ));
-            behaviours.push(behaviour::Behaviour::new(
-                vec![(1, 2)],
-                vec![(1, 1), (-1, 1)],
-            ));
-=======
             actors.push(actor::Actor::new(_ctx, "/pawn.png", i, 6, 0));
-<<<<<<< HEAD
->>>>>>> 4b6cfb4cbffca15aad2526287cb1ba8d58909c60
-=======
             board.board[usize::from(i)][6].1 = i;
->>>>>>> badc482d63df8eb117f259445c08bd36596d836b
         }
 
         actors.push(actor::Actor::new(_ctx, "/pawn.png", 4, 4, 0)); //blocking pawn for testing