Solve a merge of websservices