merge xjj