Back out commit of conflict