added swp files to .gitignore
Resolved a conflict