solved minor merging conflicts

semseg/SemSegCsurka.cpp

@@ -1544,7 +1544,7 @@ void SemSegCsurka::classifyregions ( CachedExample *ce, NICE::Image & segresult,
         double sndMaxMeanAbs ( 0.0 );
         #endif
         
-        for ( int j = 0 ; j < fV.size(); j++ )
+        for ( int j = 0 ; j < r.scores.size(); j++ )
         {
           if ( useclass[j] == 0 )
             continue;
@@ -1685,7 +1685,7 @@ void SemSegCsurka::classifyregions ( CachedExample *ce, NICE::Image & segresult,
         double sndMaxMeanAbs ( 0.0 );
         #endif        
         
-        for ( int j = 0 ; j < ( int ) fV.size(); j++ )
+        for ( int j = 0 ; j < ( int ) r.scores.size(); j++ )
         {
           if ( useclass[j] == 0 )
             continue;