code commit
resolved gitignore conflict