solve conflicts