net: stmmac: fix bad merge conflict resolution