Merged content and fixed up it