updated 从祖关系拆分

src/branch.js

@@ -154,8 +154,8 @@ export default {
     // 其他旁系
     '{G2}':['祖父'],
     '{G2},w':['祖母'],
-    '{G2},s':['父'],
-    '{G2},s,w':['母'],
+    '{G2},[s&o|s&l]':['父'],
+    '{G2},[s&o|s&l],w':['母'],
     '{G2},s,s&o':['兄'],
     '{G2},s,s&l':['弟'],
     '{G2},s,[s&o|s&l]':['兄弟'],