On August 1, 2017, the Block Size War officially ended. Bitcoin users demonstrated their independence from miner control by successfully rolling out a software update via a User Activated Soft Fork (UASF). The soft fork disregarded uncooperative miners, making it clear that users (i.e., nodes), not miners or companies, control the Bitcoin network.
You can learn more about these events in Jonathan Bier's book "The Blocksize War."