fix uncomplete merge