diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 88d07cfa6..2b1fdd365 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -843,12 +843,7 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
-<<<<<<< HEAD
-            if (   *it == ptr 
-                && it->getClass().isNpc()) continue; // not the player and is an NPC
-=======
             if (*it == ptr) continue; // not the player
->>>>>>> parent of 54d9615... NPCs detect crime exclusively
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -864,8 +859,7 @@ namespace MWMechanics
                     // Tell everyone, including yourself
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
-                        if (   *it == ptr 
-                            && it->getClass().isNpc()) continue; // not the player and is an NPC
+                        if (*it1 == ptr) continue; // not the player
 
                         // TODO: Add more messages
                         if (type == OT_Theft)