diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index c77454bdc9..6071f3577f 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -1035,8 +1035,12 @@ OPT_TOOL_EVENT EE_SELECTION_TOOL::autostartEvent( TOOL_EVENT* aEvent, EE_GRID_HE
             wxCHECK( pin, OPT_TOOL_EVENT() );
 
             if( !pin->IsVisible()
+<<<<<<< HEAD
                 && !( m_frame->eeconfig()->m_Appearance.show_hidden_pins
                       || m_frame->GetRenderSettings()->m_ShowHiddenLibPins ) )
+=======
+                && !( m_frame->eeconfig()->m_Appearance.show_hidden_pins ) )
+>>>>>>> 763cabad43 (Fix cherry-pick for v8)
             {
                 return OPT_TOOL_EVENT();
             }