Trinity’s sixth rector, William Brodie, arrived in 1969 at a time when educational tides were turning, fees were being phased out, and the days of selective schooling in the public sector were numbered. In September 1974, Trinity Academy merged with David Kilpatrick’s to become a fully comprehensive secondary serving North and West Leith, Newhaven and Trinity. There was a split site, first with the David Kilpatrick building and then, after 1981, with the Holy Cross annexes. Declining school rolls across the city led to the possibility of closure of the school or of merger with Leith Academy. Trinity Academy's first XV rugby team won Rugby World Team of the Month in November 2005 after an unbeaten run including away wins at Heriots, Glenalmond and Hutchison Grammar School.