change from github
merge branch
update gitignore