my patients with data mocks
resolved conflicts