change .gitignore
update
merge
update
merge