merge yj