remove wysiwyg and media
fix merge conflict