remove merge flags