A: No, there are still 2 baptisms. As we can see in the case of Cornelius as well as the new disciples in Ephesus and Samaria, they all underwent two baptisms; water and Holy Spirit.
First you must undergo a water baptism, meaning to repent from your old ways. This involves declaring your own spirit as wrong and adopting the teachings of Jesus to replace your old ways.
Once you have entered this state of repentance, and begin to understand and obey the teachings of Jesus without compromising, adding exceptions or manipulating them, you will be able to receive the baptism of the Holy Spirit.
The first step is to be baptized in repentance which is signified by water. In Matthew 3:11, John the Baptist says:
Matthew 3:11 – “I baptize with water those who repent of their sins and turn to God. But someone is coming soon who is greater than I am—so much greater that I’m not worthy even to be his slave and carry his sandals. He will baptize you with the Holy Spirit and with fire.
And Also in Acts 19:1-7 – While Apollos was at Corinth, Paul took the road through the interior and arrived at Ephesus. There he found some disciples 2 and asked them, “Did you receive the Holy Spirit when you believed?”
They answered, “No, we have not even heard that there is a Holy Spirit.” 3 So Paul asked, “Then what baptism did you receive?” “John’s baptism,” they replied.
4 Paul said, “John’s baptism was a baptism of repentance. He told the people to believe in the one coming after him, that is, in Jesus.” 5 On hearing this, they were baptized in the name of the Lord Jesus. 6 When Paul placed his hands on them, the Holy Spirit came on them, and they spoke in tongues and prophesied. 7 There were about twelve men in all.
