Completed the remaining manual merge, missed during rebase.