update connection string
fixed the conflicts