Fix code conflict
Fix mime type
Merge branch 'sharils' into wip