media gallery now works
conflict fix