Commit anti conflit.