fix a conflict
change gitignore
change gitignore
fixed untracked files