kaede merge