merged and added file to .gitignore