@@ -129,3 +129,20 @@ dojo:
129129|ota (sein:title our now our) %kids
130130```
131131
132+**The OTA failed for me with `%mate-conflict`**
133+
134+You can instruct Clay to simply override the contents of the relevant files with the version from your sponsor:
135+
136+dojo:
137+
138+```
139+|merge %home (sein:title our now our) %kids, =gem %take-that
140+```
141+
142+This will start the upgrade. Note that on a galaxy, star, or planet, you should also run
143+
144+```
145+|merge %kids (sein:title our now our) %kids, =gem %only-that
146+```
147+
148+to make sure OTAs go out to your sponsored ships (stars, planets, or moons).