conflict with .gitignore resolved