commit conflito