chamges to family/profile files not merged
home page style changes