resolved .gitignore conflicts