merge MC change