initial d
gitignore conflict resolved