Another manual merge attempt
gitignore fix