SO CLOSE: refactor collision detector, switch move spaces
fix conflict