stuff
remove ckeditor
fix merge conflict