Deletes stupid .swp files and manually resolved conflicts