git ignore file resolved
git ignore file resolved