modify .gitignore
backup
new merge
new merge
backup
done: make