fixed family members
merged conflicts