修改一处 编译错误

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -663,14 +663,8 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         
         if follow != 1 && follow != 2 { // 默认随行
             follow = 1
-<<<<<<< HEAD
-=======
-        }
-        // 父母和兄弟姐妹无随行配置
-        if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
-            follow = 0
->>>>>>> 630-dev
         }
+        
         // 父母和兄弟姐妹无随行配置
         if self.relationType == .father || self.relationType == .mother || self.relationType == .brother {
             follow = 0