Remove unneeded text from default content definition
fixing merge conflicts