rotator class / fixed merge