fixed triple connection bug
fixes conflicts