Resolve conflicts between patches