diff --git a/objects/keybase-account/definition.json b/objects/keybase-account/definition.json
index ce9f1fb..298ecdc 100644
--- a/objects/keybase-account/definition.json
+++ b/objects/keybase-account/definition.json
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 {
 	"name": "keybase-account",
     "meta-category": "",
@@ -50,4 +48,3 @@
 		}
 	}
 }
->>>>>>> parent of 3224f78... added description field in attributes