Resolve merge issues.
A little cleanup.
Resolve merge issues.
Fix merge issues.