[RFR] remove conflict, playground-309