Resolve merge conflict.
Resolve merge conflict.