show me "merge conflict"

src/pregmod/seBurst.tw

@@ -167,23 +167,21 @@
 				taken to the medical suite.
 			<</if>>
 
-			<<set $mom = $slaves[_b]>>
 			<<if _cToIncub > 0 || _cToNursery > 0>>
 				<<for _cb = 0; _cb < _curBabies; _cb++>> /* if there is no reserved children, code in loop will not trigger */
-					<<if $mom.curBabies[_cb].reserve == "incubator">>
-						<<set $slaves[_b] = generateChild($mom, $mom.curBabies[_cb], 1)>>
+					<<if $slaves[_b].curBabies[_cb].reserve == "incubator">>
+						<<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb], 1)>>
 						<<include "Incubator Workaround">>
-						<<run $mom.curBabies.splice($mom.curBabies[_cb], 1)>>
+						<<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>>
 						<<set _cb--, _curBabies-->>
-					<<elseif $mom.curBabies[_cb].reserve == "nursery">>
-						<<set $slaves[_b] = generateChild($mom, $mom.curBabies[_cb])>>
+					<<elseif $slaves[_b].curBabies[_cb].reserve == "nursery">>
+						<<set $slaves[_b] = generateChild($slaves[_b], $slaves[_b].curBabies[_cb])>>
 						<<include "Nursery Workaround">>
-						<<run $mom.curBabies.splice($mom.curBabies[_cb], 1)>>
+						<<run $slaves[_b].curBabies.splice($slaves[_b].curBabies[_cb], 1)>>
 						<<set _cb--, _curBabies-->>
 					<</if>>
 				<</for>>
 			<</if>>
-			<<set $slaves[_b] = $mom>>
 
 		<<else>>
 			life and <<if _curBabies <= 1>>that of $his child<<else>>those of $his children<</if>>.