merged two gitignore files