update .gitignore
fix bad merge(score not show)