workspace update
merge
merge the workspace
finish the httpserver part