Fixed failed merge in TestClientProject/App.config