changing to GET request
fixing merge conflict