Marathon deal brings ConocoPhillips assets in multiple basin