{"pages":[{"page_name":"Resolve-Conflicts","title":"Resolve Conflicts","summary":null,"action":"edited","sha":"67bb90316ad4b7c7c7df943d4638a7855468c11a","html_url":"https://github.com/grnet/e-science/wiki/Resolve-Conflicts"}]}