Fixed half-broken merge conflict.