try to fix broken gitignore after merge