They never squashed anything, and those two did have a beef (50 saying he wrote a few songs off The Documentary, Game making entire mixtapes and 20min long diss songs going at 50, etc...). They don't go after each other anymore and the tension has settled, but in no way, shape or form are they friends.