fixed conflicts

src/OCE/LBC/mppini.F90

@@ -1476,6 +1476,17 @@ ENDIF
       nthb = 0
       ntht = 0
       !
+      ntile = 0                     ! Initialise to full domain
+      nijtile = 1
+      ntsi = Nis0
+      ntsj = Njs0
+      ntei = Nie0
+      ntej = Nje0
+      nthl = 0
+      nthr = 0
+      nthb = 0
+      ntht = 0
+      !
    END SUBROUTINE init_doloop