merge next with openj