merge from ququplay