Undo commit of a conflict.