Modify gitignore
Reslved conflict