spec commit
conflict commit