A batch of updates.
Updates
Resolve conflict