Fix badly rebased World class