solve the conflict!