diff --git a/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C b/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C
index 056b11c52..e60076877 100644
--- a/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C
+++ b/src/foam/matrices/blockLduMatrix/BlockLduSmoothers/BlockLduSmoother/BlockLduSmoother.C
@@ -43,7 +43,11 @@ Foam::autoPtr<Foam::BlockLduSmoother<Type> > Foam::BlockLduSmoother<Type>::New
     const dictionary& dict
 )
 {
+<<<<<<< HEAD
     word smootherName = getName(dict);
+=======
+    word smootherName = this->getName(dict);
+>>>>>>> ac8bcf5... Clean-up of smoother selection
 
     // Not (yet?) needed:
     // const dictionary& controls = e.isDict() ? e.dict() : dictionary::null;