The Federation-Tholian War (otherwise known as the Tholian Conflict) was a conflict between the United Federation of Planets and the Tholian Assembly during the 24th century. (TNG: "The Icarus Factor") The war was a fairly low intensity conflict that saw several border skirmishes during the 2340s and 2350s. The conflict eventually gave way to greater contact and trade between the two powers. (The Dominion War Sourcebook: The Fires of Armageddon) In at least the continuity of Orion Press, this was known as the Tholian Police Action. (Orion Press: "I Never Said Goodbye")