forced merge again