Depend on a patched version of json-patch library instead of hack-patched in-project.
Fix merge conflict