So, I was working on an infinite villager farm (Minecraft 1.17), in which the baby villagers are tricked into going into a trench for jumping on beds. The trench has water which flows all the way into a mountain's bottom where I need the baby villagers to be. Now I have to make a soul sand elevator to bring the babies to the top of the mountain where there is a comfortable prison for them, but I can't think of the proper way to connect the stream of water to the soul sand elevator. The problem is that there is space for the source blocks in the soul sand elevator to flow out and oppose the stream of water in which the baby villagers come. This causes the baby villagers to not fully reach the elevator. The thing looks like this:
Is there any tutorial on this present on the Internet? If not, do let me know the proper way if you know one.