Fix typo
Fixup more merge mess