Mercedes "MJ" Javid Meets With Reza Farahan for the First Time Since Their Pool Party Feud