merge commit
merge commit
.gitignore is now working