Thrift transport changes.
Conflict resolution.