rework the connection sharing for fixing conflict bucket issue
add test for prev source code