Edited init_relationships
Fixed the merge conflct