Fix bug where basePosition was not properly updated when updating a character run's positions
Fix conflict