merged and fixed connection fix