1 files changed, 6 insertions, 0 deletions
diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index e22fc82..7c4d3d6 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -235,9 +235,15 @@ impl CreateEmbed {
     /// struct Handler;
     ///
     /// impl EventHandler for Handler {
+<<<<<<< HEAD
     ///     fn guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
     ///         use serenity::client::CACHE;
     ///         let cache = CACHE.read();
+=======
+    ///     fn on_guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
+    ///         use serenity::CACHE;
+    ///         let cache = CACHE.read().unwrap();
+>>>>>>> v0.4.3
     ///
     ///         if let Some(guild) = cache.guild(guild_id) {
     ///             let guild = guild.read();