adding shell stuff
install aliases
resolve conflicts