merge from cake