FamilySearch merge conflict solution