Attempting to resolve conflicts