Merge conflicts solved

Author: humitos

readthedocs/api/v3/tests/responses/projects-list_POST.json

@@ -12,8 +12,8 @@
     "created": "2019-04-29T10:00:00Z",
     "default_branch": "master",
     "default_version": "latest",
-    "description": null,
     "id": 4,
+    "homepage": "http://template.readthedocs.io/",
     "language": {
         "code": "en",
         "name": "English"
@@ -37,8 +37,10 @@
     "tags": [],
     "translation_of": null,
     "urls": {
+        "builds": "https://readthedocs.org/projects/test-project/builds/",
         "documentation": "http://readthedocs.org/docs/test-project/en/latest/",
-        "project_homepage": "http://template.readthedocs.io/"
+        "home": "https://readthedocs.org/projects/test-project/",
+        "versions": "https://readthedocs.org/projects/test-project/versions/"
     },
     "users": [
         {