further fixing merge conflict.

Tests all still pass locally.