Anish | disconnect connect logic
Fix merge conflict in test.foo