diff --git a/.env/.bipsdr_environment b/.env/.bipsdr_environment
new file mode 100644
index 0000000..7e014d9
--- /dev/null
+++ b/.env/.bipsdr_environment
@@ -0,0 +1,3 @@
+project_name="BIPS_"$project_name
+export PYTHONPATH=~doreenr/lib/python2.7/site-packages
+export PATH=~doreenr/BrainImagingPipelines/bin:$PATH
diff --git a/.env/.eegfmri_environment b/.env/.eegfmri_environment
index de398fa..a15c748 100644
--- a/.env/.eegfmri_environment
+++ b/.env/.eegfmri_environment
@@ -3,7 +3,9 @@
 # Source Nipype, FSL, Freesurfer
 source /software/python/setup-nipype-0.7.sh
 source /etc/fsl/5.0/fsl.sh
-source /software/common/bin/fss 5.2.0 > /dev/null
+<<<<<<< HEAD
+source /software/common/bin/fss 5.3.0 > /dev/null
+>>>>>>> 1d98d12772b3ade6aa3f2f8b4f188314f8c9a427
 
 # add PATHs
 export PATH=/software/ANTS/versions/120222/bin/:$PATH
diff --git a/.projects b/.projects
index e209661..2586e75 100644
--- a/.projects
+++ b/.projects
@@ -30,6 +30,7 @@ function gates_env()
 source ~/.env/.gates_environment
 }
 
+<<<<<<< HEAD
 function efdev_env()
 {
 source ~/.env/.efdev_environment
@@ -69,9 +70,15 @@ source ~/.env/.CASL_environment
 
 }
 
+<<<<<<< HEAD
+
+=======
 function rtsmoking_env()
 {
 
 source ~/.env/.rtsmoking_environment
 
-}
\ No newline at end of file
+}
+>>>>>>> upstream/master
+=======
+>>>>>>> 1d98d12772b3ade6aa3f2f8b4f188314f8c9a427