Update type definition.
Resolve conflict.