Sources tell TMZ that the actors have met privately several times recently and are "good" and "1000% in" for the next movie in the franchise.
The feud began when Johnson posted an Instagram criticizing some of his male-co-stars as being "candy asses." The media speculated it could be a publicity stunt that culminated in the two meeting at Wrestlemania (since Johnson is a former wrestling star). Instead, more reports filtered out that the two were being kept apart on the press tour and that Diesel had cut a fight scene featuring Johnson.
TMZ's sources said the conflict was about which actor got a bigger spotlight in the movie, but eventually Johnson acknowledged that Diesel is the true star of the movie.
But both are major draws for the franchise and it can only benefit future movies for the two to appear together.