add ignore *.swp
delete *.swp
fix conflict .gitignore