local updates
merge updates
merged more updates