fix issues with config.fish
merge files