add media in ignore
resolved conflict in files