Adding orbit and merging transport
Conflict resolution