Fix merge conflicts.

diff --cc dotbash_profile
index da81429c98298afdd72df92fd50271df69a9752f,0f4b3f9bdbb478b9760e6f159c788d5bdc46182c..709fd4601a0f9334a416faa1465c7b0829e49409
--- 1/dotbash_profile
--- 2/dotbash_profile
+++ b/dotbash_profile
@@@ -85,11 -86,8 +86,9 @@@ complete -F _envdir activat
  #
  ##################################################
  
- export JAVA_OPTS="-server -Xms512m -Xmx2048m -XX:+CMSClassUnloadingEnabled"
- 
 +export SCALA_HOME=/usr/local/bin/scala
  export PLAY_PATH="/usr/local/play"
- export PATH=$PATH:$SCALA_HOME:$PLAY_PATH
+ export PATH=$PATH:$PLAY_PATH
  
  ##################################################
  #