Fixed wrong URL build for patch calls

- Fixed passing the wrong argument to the URL generator.
- Fixed merge conflicts