update is all set to go
automerge stuff