Fix typo from merge / rebase