The Cubs catcher appears to have ended his beef with his manager. Montero was upset that Maddon didn’t play him much in the 2016 MLB postseason.

MORE: Five spring training story lines to watch

The two were spotted in an Arizona establishment bonding over a beverage. Montero tweeted this:

Montero was perturbed last year that Maddon didn’t tell him directly he would back up Willson Contreras in October. Montero still contributed to the Cubs’ World Series effort with a pinch-hit grand slam vs. the Dodgers’ Joe Blanton in Game 1 of the NLCS.

Montero is expected to split time with Contreras this season. Kyle Schwarber wants to be the Cubs’ long-term answer behind the plate, but he’s well on his way to becoming a full-time outfielder after suffering a severe knee injury last April.