Confilcting commit