update .gitignore fiel
resovel conflict