Associate updates with a commit (so they can be incrementally applied)
merge
Re-removed socket.io