Earlier this month, former NBA player and coach, Derek Fisher, got on one knee and asked his girlfriend, Gloria Govan, to marry him, to which she gave him a resounding yes.

According to TMZ, the proposal took place on April 7, during a family gathering at the couple's home in Los Angeles. Govan was surrounded by her children and her nephew when Fisher popped the question. 

The two have been in a relationship since 2015, and both are previously divorced. This has caused quite a bit of strife in their relationship, especially between Fisher and Govan's former husband, Matt Barnes, a retired NBA who, last year, won a championship with the Golden State Warriors

The beef between the two has been lengthy and bizarre. Some standout incidents include threats of a restraining order, passive aggressive Instagram comments, and Fisher crashing Barnes' SUV during a DUI incident. 

However, those of you who are expecting some new drama from Barnes may be disappointed, as he went to Instagram to post a totally healthy response to the engagement and with the couple congratulations. 

In the post, Barnes writes, "I have two beautiful boys from my ex we are both focussing on co-parenting & providing the best atmosphere & childhood for them! They love him, so I love it.. Despite not seeing eye to eye initially w Derek he & i are on the same page & communicate weekly about isaiah & carter.. With that being said congrats on the engagement!"

It seems the beef has been totally squashed at this point. Congrats to Fisher and Govan on the engagement.