refactor all exports to zshrc
remove merge files
fix merge diferences