Fixed incorrect merge.