adding connection popup
correcting merge error