Fixed conflicts for merge.