Mack and Devon finally end their feud… or do they? A special surprise for Devon digs up the buried hatchet.