Make changes to extended relationship model to fix the hierarchy and names
Resolve conflicts. Take mine