updated bash paths
conflict fix