Fixed robber movement problems on local client
Resolved merge conflicts