added .swp to gitignore
oops, have to use the right syntax
fix merge conflict