refresh gitignore
conflict fixed