fix merge conflict

bash_aliases

@@ -1,6 +1,9 @@
+alias apr='sudo service httpd restart'
 alias dlog='date=`date "+%Y-%m-%d"`; tail -f /usr/local/datashare/log/dspace.log.$date'
 alias gitsmpull='git pull && git submodule update'
 alias h='history'
+alias psqlds='psql -d datashar -U datashar'
 alias rt='sudo su tomcat /usr/local/datashare/bin/service.sh restart_tomcat'
 alias st='sudo /usr/local/datashare/bin/service.sh stop_tomcat'
 alias tlog='tail -f /opt/tomcat/logs/catalina.out'
+

bashrc

@@ -7,4 +7,4 @@ if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
-export PATH=$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin
+export PATH=/usr/local/datashare/bin:$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/bin