Michael Phelps just won his 21st Olympic gold medal

He reclaimed his 200m butterfly title after an upset in 2012.

Update: Shortly after this story was published, Michael Phelps claimed his 21st Olympic gold medal in the 4x200 relay. This brings Phelps' grand total to 25 overall medals!

Videos by FanBuzz

Just in case anyone was wondering if Michael Phelps has still got it, the champion swimmer just won another gold medal at the 2016 Olympics in Rio de Janeiro, Brazil — bringing his grand total to a historic 20 Olympic gold medals.

Phelps didn't have the lead from the start of the men's 200m butterfly race, but powered through thanks to a fantastic final turn that helped push him into a first place lead. As soon as the race was over, Phelps looked extremely pleased to have come out on top. Perhaps this had something to do with the fact that he defeated Chad le Clos, an Olympic swimmer from South Africa. Phelps and le Clos' rivalry has played out in the public eye for almost two years now and this race felt like a culmination of sorts.

RELATED: Katie Ledecky continues to inspire with another stellar Olympic gold win

Le Clos won the 200m butterfly race in 2012, taking the title away from Phelps, who had won it in 2004 and 2008. Le Clos beat Phelps by just .05 seconds at the London 2012 Olympics. This time, Phelps got the victory in 1:53.36. 

Twitter users were quick to comment on the rivalry in the aftermath of this race, which ultimately ended in victory for Phelps.

https://twitter.com/Bollig87/status/763187239807397890

https://twitter.com/ashleyzepeda/status/763179795991633924

Michael Phelps proved once again that he's the greatest swimmer in the world, so much so that even the team USA basketball team was squealing with excitement. Just look at Kevin Durant's face, he's positively giddy!

It looks like baby Boomer didn't make it through his daddy's race, but we're sure that he and mom are so proud.

Boomer, the son of United States' Michael Phelps, sleeps on the shoulder of his mother Nicole Johnson as she leaves the hall after the men's 200-meter butterfly final during the swimming competitions at the 2016 Summer Olympics, Tuesday, Aug. 9, 2016, in Rio de Janeiro, Brazil. (AP Photo/Martin Meissner)

(AP Photo/Martin Meissner)

Michael Phelps now has a total of 24 overall medals, an Olympic record. Congratulations on the well-deserved victory!