mmc: core: fix merge bug