modify gitignore
solve conflict