Remove swp files. Add them to the global gitignore
Pull the branch