turn off wp_debug
add media folder
set WP_DEBUG to log errors (off by default)
fix merge conflict
fix merge conflict