Yes, merge - Chamin and Cholent are one and the same. Cholent is the Yiddish term, which is the mostly widely used, whereas Chamin is Hebrew and mainly used in Israel (primarily by Sephardi/Mizrahi families).