abstract REST web service helpe
resolved conflicts
Resolving conflicts