Delete media files and add media to .gitignore
Fix conflict in .gitignore