Merge MZ with Master