Move live-blog-updates to correct folder and correct other merge errors