resolve conflict

Author: schweitzpgi

flang/lib/Lower/Bridge.cpp

@@ -1968,16 +1968,10 @@ class FirConverter : public Fortran::lower::AbstractConverter {
                              ? Fortran::lower::createSomeArrayBox(
                                    *this, assign.rhs, localSymbols, stmtCtx)
                              : genExprAddr(assign.rhs, stmtCtx);
-<<<<<<< Updated upstream
               fir::factory::associateMutableBoxWithRemap(*builder, loc, lhs,
                                                          rhs, lbounds, ubounds);
             },
         },
-=======
-              Fortran::lower::associateMutableBoxWithRemap(
-                  *builder, loc, lhs, rhs, lbounds, ubounds);
-            }},
->>>>>>> Stashed changes
         assign.u);
   }