change gitignore
fix conflict