confrict commit