diff --git a/.gitignore b/.gitignore
index 4e387c47ef25aaf223241f404e2dc55cf65d33cb..e89eb583c2b427fc0e033303043c1881c0d22bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 output
 .settings
 .classpath
@@ -5,3 +6,99 @@ output
 
 /bin/
 /target/
+=======
+.settings
+.classpath
+.project
+
+# gitignore for Java (https://github.com/github/gitignore/blob/master/Java.gitignore)
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# gitignore for eclispe (https://github.com/github/gitignore/blob/master/Global/Eclipse.gitignore)
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools 
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# personal
+data/divers/
+data/input/.~*
+data/output/
+bin
+build
+dist
+target
+.classpath
+.project
+org.*
+/src/main/java/miscellaneous/Essai.java
+>>>>>>> master
diff --git a/data/input/fishTryRealBV.xml b/data/input/fishTryRealBV.xml
index df219be0b39a13c1b9a78b952c35900c706d35ba..4d7ef568c8991bf85777bd7ec2f620c7176c167e 100644
--- a/data/input/fishTryRealBV.xml
+++ b/data/input/fishTryRealBV.xml
@@ -15,11 +15,11 @@
 			<processesAtBegin>
 				<species.PopulateBasinNetwork>
 					<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
-					<nbSIPerBasin>2500</nbSIPerBasin>
-					<nbFishPerBasin>200</nbFishPerBasin>
+					<nbSIPerBasin>200</nbSIPerBasin>
+					<nbFishPerSI>2500</nbFishPerSI>
 					<initialLength>2.0</initialLength>
 				</species.PopulateBasinNetwork>
-				
+
 				<environment.fixTemperatureInRealBasin>
 					<synchronisationMode>ASYNCHRONOUS</synchronisationMode>
 					<selectedYear>1950</selectedYear>
diff --git a/data/input/fishTryRealBV_CC.xml b/data/input/fishTryRealBV_CC.xml
index 6c212e79d765bb1ac1d5336bffeb44f47cf839de..e5224a8d6ae123952b942bec9a2aee70fb036ff3 100644
--- a/data/input/fishTryRealBV_CC.xml
+++ b/data/input/fishTryRealBV_CC.xml
@@ -10,8 +10,7 @@
               <linfVonBert>60.0</linfVonBert>
               <dMaxDisp>0.0</dMaxDisp>
               <lFirstMaturity>40.0</lFirstMaturity>
-              <fileNameInputForInitialObservation>data/input/reality/Obs1900.csv
-              </fileNameInputForInitialObservation>
+              <fileNameInputForInitialObservation>data/input/reality/Obs1900.csv</fileNameInputForInitialObservation>
 
               <processes>
                      <processesAtBegin>
diff --git a/src/main/java/species/DiadromousFishGroup.java b/src/main/java/species/DiadromousFishGroup.java
index 9f338b6e9c128c3a32daae59a6b168398f3639a1..d503f9bbe25a276ed71b136bc9e72fead95f6f57 100644
--- a/src/main/java/species/DiadromousFishGroup.java
+++ b/src/main/java/species/DiadromousFishGroup.java
@@ -97,7 +97,7 @@ public class DiadromousFishGroup extends AquaNismsGroup< DiadromousFish, BasinNe
 			InvocationTargetException {
 		super.initTransientParameters(pilot);
 
-		if (basinsToUpdateFile != null){
+		if ( basinsToUpdate != null){
 			String subDir=basinsToUpdateFile;
 			if (basinsToUpdateFile.lastIndexOf("/")!=-1)
 				subDir=basinsToUpdateFile.substring(basinsToUpdateFile.lastIndexOf("/")+1,