diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json
index e69de29..ce9f1fb 100644
--- a/objects/keybase-account/definition.json
+++ b/objects/keybase-account/definition.json
@@ -0,0 +1,53 @@
+<<<<<<< HEAD
+=======
+{
+	"name": "keybase-account",
+    "meta-category": "",
+    "description": "Information related to a keybase account, from API Users Object",
+    "version": 1,
+    "uuid": "32c29c1c-a6c1-41e9-b1db-8cca88185ecd",
+    "attributes" :
+	{
+		"uid": {
+			"misp-attribute": "text",
+			"ui-priority": 1
+		},
+		"username": {
+			"misp-attribute": "text",
+			"ui-priority": 1
+		},
+		"full_name": {
+			"misp-attribute": "text",
+			"ui-priority": 1
+		},
+		"location": {
+			"misp-attribute": "text",
+			"ui-priority": 1
+		},
+		"bio": {
+			"misp-attribute": "text",
+			"ui-priority": 1
+		},
+		"emails": {
+			"misp-attribute": "text",
+			"multiple": true,
+			"ui-priority" : 1
+		},
+		"public_keys": {
+			"misp-attribute": "text",
+			"multiple": true,
+			"ui-priority": 1
+		},
+		"private_keys": {
+			"misp-attribute": "text",
+			"multiple": true,
+			"ui-priority": 1
+		},
+		"cryptocurrency_addresses": {
+			"misp-attribute": "btc",
+			"multiple": true,
+			"ui-priority": 1
+		}
+	}
+}
+>>>>>>> parent of 3224f78... added description field in attributes