Fix update from merge.