fix typo
Merge unresolved symbols.
Cleanup.