added .gitignore
fixed a merge bug