[update] soft merge changes
.gitignore is now working