remove mess from conflict markup