changed media path to relative
merge conflicts