Luke 3:16 John answered, saying unto them all, I indeed baptize you with water; but one mightier than I cometh, the latchet of whose shoes I am not worthy to unloose: he shall baptize you with the Holy Ghost and with fire.
Acts 2:33 Therefore being by the right hand of God exalted, and having received of the Father the promise of the Holy Ghost, he hath shed forth this, which ye now see and hear.
Peter quoted the prophet Joel on the Day of Pentecost as being a fulfillment of the promise of The Holy Spirit being poured out upon all flesh. John the Baptizer referred to Jesus as The One Who would baptize with The Holy Ghost. It is one thing to be baptized by The Spirit into the body of Christ. It is another thing to be baptized by Jesus with The Holy Ghost. The Spirit leads us to Christ, and Christ baptizes us with The Spirit.
1 Corinthians 12:13 speaks of our entrance into the body of Christ. “For by one Spirit are we all baptized into one body, whether [we be] Jews or Gentiles, whether [we be] bond or free; and have been all made to drink into one Spirit.” Luke 24:49 speaks of being empowered from on high by The Spirit. “And, behold, I send the promise of my Father upon you: but tarry ye in the city of Jerusalem, until ye be endued with power from on high.”
These two passages of Scripture are not talking about the same thing. Those who have been brought into the body of Christ by The Spirit are given the promise of the power of The Spirit to live for Christ and bring glory to the Father. There is no theological conflict here. Just a simple reminder that the very same Spirit Who leads us to Christ, is the Spirit Who empowers us to live for Christ. The flesh, no matter how smart or brilliant or valiant, profits nothing. The presence and power of The Spirit gives life (John 6:63).