Additional conflict fixes after merge.