Page Action: Ship Mates

Shiny Midnight BlackShip Mates Shipper On Deck
Page Action
Page Action: Ship Mates
What would be the best way to fix the page?
At issue:
Ship Mates was launched (and is still defined on some other pages) with one definition. Somehow, at some point, it was changed to another entirely different definition, on which a good number of examples are currently based. Which definition should hold?

(A future crowner will determine what happens to the "losing" definition.)
This issue has been resolved and voting is closed.
+18 (yeas:20 nays:2)
Fandom Pairing The Spares to make way for the Fan-Preferred Couple (the original definition)
0 (yeas:5 nays:5)
Friendly Fandoms for Shipping, contrasting Ship-to-Ship Combat (the changed definition, not currently reflected on page, but in many examples)
-7 (yeas:0 nays:7)
Somehow make both definitions work together (or send the losing definition to the YKTTW)
Total number: 3. Number shown: 3.

Total number of votes: 39

Shiny Midnight BlackShip Mates Shipper On Deck
Page Action
http://tvtropes.org/pmwiki/crowner.php/PageAction/ShipMates?openall=yes