Attempt manual merge.

Attempt manual merge.