Fix merging errors with climber subclass