init commit
solve origin gitignore conflict