Fix movement logic
Fix merge conflict