made change for david to conflict with