updated to test server
Merge resolved