Adds missing files and directories
Deletes vim history
Adds FISH configurations
Resolves merge conflicts