[Core] Fix merge error
[Core] Fix HomeMovementGenerator