Removed .swp files from merge