diff --git a/CHANGELOG.md b/CHANGELOG.md
index 127e6c88bf..c22973539d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1128,4 +1128,4 @@ fix(AEP exampe): Fix contract in AEPP example
 
 ### Bug Fixes
 
-* **Chore** More consistent code examples
+* **Chore** More consistent code examples
\ No newline at end of file
diff --git a/docs/api/ae/contract.md b/docs/api/ae/contract.md
index 8292ecb9e7..fd8874c53c 100644
--- a/docs/api/ae/contract.md
+++ b/docs/api/ae/contract.md
@@ -215,7 +215,10 @@ Compile contract source code
 | source | `String` |  | Contract sourece code |
 | [options] | `Object` | <code>{}</code> | Transaction options (fee, ttl, gas, amount, deposit) |
 | [options.filesystem] | `Object` | <code>{}</code> | Contract external namespaces map* @return {Promise<Object>} Result object |
+<<<<<<< HEAD
+=======
 | [options.backend] | `Object` | <code>&#x27;aevm&#x27;</code> | Contract backend version (aevm|fate) |
+>>>>>>> develop
 
 **Example**  
 ```js
diff --git a/package-lock.json b/package-lock.json
index 2d9599a4f6..de940579da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11146,4 +11146,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file