Updates
Resolve conflicts