(minor) KT-11588 Type aliases: fix conflicts after rebase.

compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java

@@ -701,7 +701,7 @@ public class DescriptorResolver {
             }
             else {
                 LexicalWritableScope writableScope = new LexicalWritableScope(
-                        scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace),
+                        scope, containingDeclaration, false, null, new TraceBasedLocalRedeclarationChecker(trace, overloadChecker),
                         LexicalScopeKind.TYPE_ALIAS_HEADER);
                 typeParameterDescriptors = resolveTypeParametersForDescriptor(
                         typeAliasDescriptor, writableScope, scope, typeParameters, trace);

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt

@@ -89,8 +89,8 @@ abstract class AbstractTypeAliasDescriptor(
         override fun getBuiltIns(): KotlinBuiltIns =
                 declarationDescriptor.builtIns
 
-        override fun getAnnotations(): Annotations =
-                declarationDescriptor.annotations
+        override val annotations: Annotations
+            get() = declarationDescriptor.annotations
     }
 
 }