diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index 28f88a928f0135cb1d009e516268ad570fe95319..4b79466ff3cf98465a8038fabfc6402d38c86580 100644
--- a/e2e/pab.e2e-spec.ts
+++ b/e2e/pab.e2e-spec.ts
@@ -124,21 +124,23 @@ describe("ngHyd − Passe à Bassins", () => {
             await scrollPageToTop();
             // generate PAB
             const genButton = await calcPage.getGeneratePabButton();
-            await genButton.isExisting();
-            await genButton.isDisplayed();
+            // await genButton.isExisting();
+            // await genButton.isDisplayed();
             await genButton.click();
             await browser.pause(1000);
             const nbBassins = await calcPage.getInputById("generatePabNbBassins");
             await nbBassins.setValue("9");
 
             // click "Generate"
-            await $("dialog-generate-pab button#do-generate").click();
+            // await $("dialog-generate-pab button#do-generate").click();
+            const doGen = await $("dialog-generate-pab button#do-generate");
+            await doGen.click();
             await browser.pause(1000);
 
             // calculate PAB
             const calcButtonPAB = await calcPage.getCalculateButton();
             await calcButtonPAB.click();
-            await browser.pause(200);
+            await browser.pause(500);
 
             // check that result is not empty
             const hasResults = await calcPage.hasResults();
@@ -185,8 +187,10 @@ describe("ngHyd − Passe à Bassins", () => {
             const genButton = await calcPage.getGeneratePabButton();
             await genButton.click();
             await browser.pause(1000);
+
             const debit = await calcPage.getInputById("generatePabDebit");
-            expect(await debit.getValue()).toBe("0.564");
+            expect(await debit.getValue()).toBe("1.128");
+            await debit.clearValue();
             // send "1.6" in 3 movements, because "." triggers an error and Angular can't cope with the subsequent keys
             await debit.setValue("1");
             await debit.addValue(".");
diff --git a/e2e/session/session-erreur-ennoiement-614.json b/e2e/session/session-erreur-ennoiement-614.json
index 2c3933bd675755a718220a266b84643d3646711f..e0a38e6b2fc3b230a2034e98a180d371682a37de 100644
--- a/e2e/session/session-erreur-ennoiement-614.json
+++ b/e2e/session/session-erreur-ennoiement-614.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"header":{"source":"jalhyd","format_version":"1.3","created":"2023-04-03T12:18:32.015Z"},"settings":{"precision":1e-7,"maxIterations":100,"displayPrecision":3},"documentation":"","session":[{"uid":"cTl6aT","props":{"calcType":"Cloisons","nullparams":false},"meta":{"title":"Cloisons"},"children":[{"uid":"NWllMn","props":{"calcType":"Structure","loiDebit":"WeirSubmergedLarinier","structureType":"SeuilRectangulaire","nullparams":false},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":1},{"symbol":"L","mode":"SINGLE","value":0.2},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"Q","mode":"CALCUL"},{"symbol":"Z1","mode":"SINGLE","value":102},{"symbol":"LB","mode":"SINGLE","value":10},{"symbol":"BB","mode":"SINGLE","value":1},{"symbol":"PB","mode":"SINGLE","value":1},{"symbol":"DH","mode":"SINGLE","value":0.6}]},{"uid":"bW4wZz","props":{"calcType":"ParallelStructure","nullparams":false},"meta":{"title":"Ouvrages"},"children":[{"uid":"anFpeG","props":{"calcType":"Structure","loiDebit":"WeirSubmerged","structureType":"SeuilRectangulaire","nullparams":false},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":100},{"symbol":"L","mode":"SINGLE","value":2},{"symbol":"CdWS","mode":"SINGLE","value":0.9}]}],"parameters":[{"symbol":"Q","mode":"SINGLE","value":14.647},{"symbol":"Z1","mode":"CALCUL","value":103},{"symbol":"Z2","mode":"SINGLE","value":101.5}]}]}
-=======
-{"header":{"source":"jalhyd","format_version":"1.3","created":"2023-04-03T12:18:32.015Z"},"settings":{"precision":1e-7,"maxIterations":100,"displayPrecision":3},"documentation":"","session":[{"uid":"cTl6aT","props":{"calcType":"Cloisons","nullparams":false},"meta":{"title":"Cloisons"},"children":[{"uid":"NWllMn","props":{"calcType":"Structure","loiDebit":"WeirSubmergedLarinier","structureType":"SeuilRectangulaire","nullparams":false},"children":[],"parameters":[{"symbol":"h1","mode":"SINGLE","value":1},{"symbol":"L","mode":"SINGLE","value":0.2},{"symbol":"CdWSL","mode":"SINGLE","value":0.75}]}],"parameters":[{"symbol":"Q","mode":"CALCUL"},{"symbol":"Z1","mode":"SINGLE","value":102},{"symbol":"LB","mode":"SINGLE","value":10},{"symbol":"BB","mode":"SINGLE","value":1},{"symbol":"PB","mode":"SINGLE","value":1},{"symbol":"DH","mode":"SINGLE","value":0.6}]},{"uid":"bW4wZz","props":{"calcType":"ParallelStructure","nullparams":false},"meta":{"title":"Ouvrages"},"children":[{"uid":"anFpeG","props":{"calcType":"Structure","loiDebit":"WeirSubmerged","structureType":"SeuilRectangulaire","nullparams":false},"children":[],"parameters":[{"symbol":"ZDV","mode":"SINGLE","value":100},{"symbol":"L","mode":"SINGLE","value":2},{"symbol":"CdWS","mode":"SINGLE","value":0.9}]}],"parameters":[{"symbol":"Q","mode":"SINGLE","value":14.647},{"symbol":"Z1","mode":"CALCUL","value":103},{"symbol":"Z2","mode":"SINGLE","value":101.5}]}]}
->>>>>>> 80e36eb0 (test(e2e): parallel structures: check submergence error)