extended "solve conflicts"