Merge with ok updates