Try to resolve conflicts