Change Connection string
Merge conflict resolved