Fixing media links
Merging