Resolve conflicts
Conflicts