Small type definitions
Working on a conversation system.
Conflicts resolution
Merge conflicts the return.