Conflicting imports error for imports of classes and packages

compiler/testData/diagnostics/tests/imports/ExplicitImportsAmbiguity.kt

@@ -11,7 +11,7 @@ class X
 // FILE: c.kt
 package c
 
-import a.X
-import b.X
+import <!CONFLICTING_IMPORT!>a.X<!>
+import <!CONFLICTING_IMPORT!>b.X<!>
 
 class Y : <!UNRESOLVED_REFERENCE!>X<!>

compiler/testData/diagnostics/tests/imports/ExplicitPackageImportsAmbiguity.kt

@@ -0,0 +1,17 @@
+// FILE: a.kt
+package a.x
+
+class X
+
+// FILE: b.kt
+package b.x
+
+class X
+
+// FILE: c.kt
+package c
+
+import <!CONFLICTING_IMPORT!>a.x<!>
+import <!CONFLICTING_IMPORT!>b.x<!>
+
+class Y : <!UNRESOLVED_REFERENCE!>x<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>X<!>

compiler/testData/diagnostics/tests/imports/ExplicitPackageImportsAmbiguity.txt

@@ -0,0 +1,37 @@
+package
+
+package a {
+
+    package a.x {
+
+        internal final class X {
+            public constructor X()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}
+
+package b {
+
+    package b.x {
+
+        internal final class X {
+            public constructor X()
+            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+        }
+    }
+}
+
+package c {
+
+    internal final class Y {
+        public constructor Y()
+        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+    }
+}