diff --git a/Cargo.lock b/Cargo.lock
index 3f6b9eaf2..6606113f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -460,14 +460,7 @@ dependencies = [
 name = "cosmwasm-derive"
 version = "1.5.8"
 dependencies = [
-<<<<<<< HEAD
- "cosmwasm-std",
  "syn 1.0.109",
-=======
- "proc-macro2",
- "quote",
- "syn 2.0.66",
->>>>>>> e230048f1 (Document entry_point in cosmwasm-std instead of derive)
 ]
 
 [[package]]
diff --git a/packages/derive/Cargo.toml b/packages/derive/Cargo.toml
index 3f69dddc2..a02dd3a0f 100644
--- a/packages/derive/Cargo.toml
+++ b/packages/derive/Cargo.toml
@@ -15,17 +15,4 @@ proc-macro = true
 default = []
 
 [dependencies]
-<<<<<<< HEAD
 syn = { version = "1.0", features = ["full"] }
-
-[dev-dependencies]
-# Needed for testing docs
-# "What's even more fun, Cargo packages actually can have cyclic dependencies.
-# "(a package can have an indirect dev-dependency on itself)"
-# https://users.rust-lang.org/t/does-cargo-support-cyclic-dependencies/35666/3
-cosmwasm-std = { path = "../std" }
-=======
-proc-macro2 = "1.0.79"
-quote = "1.0.35"
-syn = { version = "2", features = ["full"] }
->>>>>>> e230048f1 (Document entry_point in cosmwasm-std instead of derive)
diff --git a/packages/derive/src/lib.rs b/packages/derive/src/lib.rs
index c35dc73e6..9018439bf 100644
--- a/packages/derive/src/lib.rs
+++ b/packages/derive/src/lib.rs
@@ -4,57 +4,7 @@ extern crate syn;
 use proc_macro::TokenStream;
 use std::str::FromStr;
 
-<<<<<<< HEAD
-/// This attribute macro generates the boilerplate required to call into the
-/// contract-specific logic from the entry-points to the Wasm module.
-///
-/// It should be added to the contract's init, handle, migrate and query implementations
-/// like this:
-/// ```
-/// # use cosmwasm_std::{
-/// #     Storage, Api, Querier, DepsMut, Deps, entry_point, Env, StdError, MessageInfo,
-/// #     Response, QueryResponse,
-/// # };
-/// #
-/// # type InstantiateMsg = ();
-/// # type ExecuteMsg = ();
-/// # type QueryMsg = ();
-///
-/// #[entry_point]
-/// pub fn instantiate(
-///     deps: DepsMut,
-///     env: Env,
-///     info: MessageInfo,
-///     msg: InstantiateMsg,
-/// ) -> Result<Response, StdError> {
-/// #   Ok(Default::default())
-/// }
-///
-/// #[entry_point]
-/// pub fn execute(
-///     deps: DepsMut,
-///     env: Env,
-///     info: MessageInfo,
-///     msg: ExecuteMsg,
-/// ) -> Result<Response, StdError> {
-/// #   Ok(Default::default())
-/// }
-///
-/// #[entry_point]
-/// pub fn query(
-///     deps: Deps,
-///     env: Env,
-///     msg: QueryMsg,
-/// ) -> Result<QueryResponse, StdError> {
-/// #   Ok(Default::default())
-/// }
-/// ```
-///
-/// where `InstantiateMsg`, `ExecuteMsg`, and `QueryMsg` are contract defined
-/// types that implement `DeserializeOwned + JsonSchema`.
-=======
 // function documented in cosmwasm-std
->>>>>>> e230048f1 (Document entry_point in cosmwasm-std instead of derive)
 #[proc_macro_attribute]
 pub fn entry_point(_attr: TokenStream, mut item: TokenStream) -> TokenStream {
     let cloned = item.clone();
diff --git a/packages/std/src/lib.rs b/packages/std/src/lib.rs
index 664f42c40..fda18b947 100644
--- a/packages/std/src/lib.rs
+++ b/packages/std/src/lib.rs
@@ -124,12 +124,6 @@ pub use crate::imports::{ExternalApi, ExternalQuerier, ExternalStorage};
 #[cfg(not(target_arch = "wasm32"))]
 pub mod testing;
 
-<<<<<<< HEAD
-// Re-exports
-
-=======
-pub use cosmwasm_core::{BLS12_381_G1_GENERATOR, BLS12_381_G2_GENERATOR};
-
 /// This attribute macro generates the boilerplate required to call into the
 /// contract-specific logic from the entry-points to the Wasm module.
 ///
@@ -214,5 +208,4 @@ pub use cosmwasm_core::{BLS12_381_G1_GENERATOR, BLS12_381_G2_GENERATOR};
 ///     todo!();
 /// }
 /// ```
->>>>>>> e230048f1 (Document entry_point in cosmwasm-std instead of derive)
 pub use cosmwasm_derive::entry_point;