openssh: Fix some merging mistakes I made.