Team Octopus/Trailer 1.0.19

Merging/closing detection logic was not following correctly from the new options
Also (finally!) squashed a corner case for a menu badging issue