merge yameii