fix families controller merge conflict