Removing pre-merge conflict originals.
Methinks this gets things correct; tested with a small cock and got the small scene (4*1), medium cock (~14.5 * ~2.3 from the provided save) and a massive cock (30 * 15) and got the appropriate combinations of scene text.