ninja insert commit for conflict