Manually merging the hotfix branch with the truck