After an incredible battle over the final laps of the Catalan GP Valentino Rossi and Marc Marquez appear to have put the past behind them.