fixed a minor move checking bug
fixing merge conflicts
Fixing merge conflicts