new conflict
merged 2