A big merger between oil rivals is gassing up energy consolidation in the US