Fix typo introduced during conflict resolution