merging
adding some media filtering
oh apple
merge conflict resolution