Conflict fix.

Fixing conflict for upcoming merge.