Merge javaxyq