Updating forgotten unmerged conflicts