mmc: card: block.c: Fix conflict Part_2