parent/children associations
fix schema merge