family restored after conflict