add gitignore
resolve confict in .gitignore