manual merge for git pull 'update prediction strategy'