change to .gitignore
merge