Core/Movement: Fixed one (probably many remain) merge error