ckeditor for admin
Resolve merge conflict