fixed merge conflict
fixed mc