replacing .bash files with bash files + symlink
fast forward merge