Resolve conflicts
Resolve conflicts