manual merge completed content entry and html markup