ghci conf
aliases, bashrc
fix merge