diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
index 2f24f03cffe..cdf4dcd5aa7 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptor.java
@@ -24,6 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.TraceBasedRedeclarationHandler;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl;
 import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver;
@@ -57,7 +58,7 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite {
             throw new IllegalStateException();
         }
 
-        TraceBasedRedeclarationHandler redeclarationHandler = new TraceBasedRedeclarationHandler(trace);
+        RedeclarationHandler redeclarationHandler = RedeclarationHandler.DO_NOTHING;
 
         setScopeForMemberLookup(new WritableScopeImpl(JetScope.EMPTY, this, redeclarationHandler).setDebugName("MemberLookup").changeLockLevel(WritableScope.LockLevel.BOTH));
         this.scopeForSupertypeResolution = new WritableScopeImpl(outerScope, this, redeclarationHandler).setDebugName("SupertypeResolution").changeLockLevel(WritableScope.LockLevel.BOTH);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
index 36ba736545a..305ffef2f66 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java
@@ -103,7 +103,7 @@ public class OverloadResolver {
 
     private void checkOverloadsInANamespace(MultiMap<Key, ConstructorDescriptor> inNamespaces) {
 
-        MultiMap<Key, FunctionDescriptor> functionsByName = MultiMap.create();
+        MultiMap<Key, CallableMemberDescriptor> functionsByName = MultiMap.create();
 
         for (NamedFunctionDescriptor function : context.getFunctions().values()) {
             DeclarationDescriptor containingDeclaration = function.getContainingDeclaration();
@@ -113,11 +113,19 @@ public class OverloadResolver {
             }
         }
         
+        for (PropertyDescriptor property : context.getProperties().values()) {
+            DeclarationDescriptor containingDeclaration = property.getContainingDeclaration();
+            if (containingDeclaration instanceof NamespaceDescriptor) {
+                NamespaceDescriptor namespaceDescriptor = (NamespaceDescriptor) containingDeclaration;
+                functionsByName.putValue(new Key(namespaceDescriptor, property.getName()), property);
+            }
+        }
+        
         for (Map.Entry<Key, Collection<ConstructorDescriptor>> entry : inNamespaces.entrySet()) {
             functionsByName.putValues(entry.getKey(), entry.getValue());
         }
 
-        for (Map.Entry<Key, Collection<FunctionDescriptor>> e : functionsByName.entrySet()) {
+        for (Map.Entry<Key, Collection<CallableMemberDescriptor>> e : functionsByName.entrySet()) {
             checkOverloadsWithSameName(e.getKey().getFunctionName(), e.getValue(), e.getKey().getNamespace());
         }
     }
@@ -140,17 +148,21 @@ public class OverloadResolver {
             MutableClassDescriptor classDescriptor, JetClassOrObject klass,
             Collection<ConstructorDescriptor> nestedClassConstructors)
     {
-        MultiMap<String, FunctionDescriptor> functionsByName = MultiMap.create();
+        MultiMap<String, CallableMemberDescriptor> functionsByName = MultiMap.create();
         
         for (FunctionDescriptor function : classDescriptor.getFunctions()) {
             functionsByName.putValue(function.getName(), function);
         }
         
+        for (PropertyDescriptor property : classDescriptor.getProperties()) {
+            functionsByName.putValue(property.getName(), property);
+        }
+        
         for (ConstructorDescriptor nestedClassConstructor : nestedClassConstructors) {
             functionsByName.putValue(nestedClassConstructor.getContainingDeclaration().getName(), nestedClassConstructor);
         }
         
-        for (Map.Entry<String, Collection<FunctionDescriptor>> e : functionsByName.entrySet()) {
+        for (Map.Entry<String, Collection<CallableMemberDescriptor>> e : functionsByName.entrySet()) {
             checkOverloadsWithSameName(e.getKey(), e.getValue(), nameForErrorMessage(classDescriptor, klass));
         }
 
@@ -160,14 +172,14 @@ public class OverloadResolver {
 
     }
     
-    private void checkOverloadsWithSameName(String name, Collection<FunctionDescriptor> functions, @NotNull String functionContainer) {
+    private void checkOverloadsWithSameName(String name, Collection<CallableMemberDescriptor> functions, @NotNull String functionContainer) {
         if (functions.size() == 1) {
             // microoptimization
             return;
         }
         
-        for (FunctionDescriptor function : functions) {
-            for (FunctionDescriptor function2 : functions) {
+        for (CallableMemberDescriptor function : functions) {
+            for (CallableMemberDescriptor function2 : functions) {
                 if (function == function2) {
                     continue;
                 }
@@ -180,7 +192,11 @@ public class OverloadResolver {
                         return;
                     }
 
-                    context.getTrace().report(Errors.CONFLICTING_OVERLOADS.on(member, function, functionContainer));
+                    if (function instanceof PropertyDescriptor) {
+                        context.getTrace().report(Errors.REDECLARATION.on(function, context.getTrace().getBindingContext()));
+                    } else {
+                        context.getTrace().report(Errors.CONFLICTING_OVERLOADS.on(member, function, functionContainer));
+                    }
                 }
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java
index 064569b2e3d..be3c6668329 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java
@@ -16,7 +16,10 @@
 
 package org.jetbrains.jet.lang.resolve;
 
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor;
+import org.jetbrains.jet.lang.descriptors.NamedFunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 
 /**
  * @author Stepan Koltsov
@@ -26,18 +29,37 @@ public class OverloadUtil {
     /**
      * Does not check names.
      */
-    public static OverloadCompatibilityInfo isOverloadble(FunctionDescriptor a, FunctionDescriptor b) {
+    public static OverloadCompatibilityInfo isOverloadble(CallableDescriptor a, CallableDescriptor b) {
+        int abc = braceCount(a);
+        int bbc = braceCount(b);
+        
+        if (abc != bbc) {
+            return OverloadCompatibilityInfo.success();
+        }
+        
         OverridingUtil.OverrideCompatibilityInfo overrideCompatibilityInfo = OverridingUtil.isOverridableByImpl(a, b, false);
         switch (overrideCompatibilityInfo.isOverridable()) {
             case OVERRIDABLE:
-                return OverloadCompatibilityInfo.someError();
             case CONFLICT:
+                return OverloadCompatibilityInfo.someError();
             case INCOMPATIBLE:
                 return OverloadCompatibilityInfo.success();
             default:
                 throw new IllegalStateException();
         }
     }
+    
+    private static int braceCount(CallableDescriptor a) {
+        if (a instanceof PropertyDescriptor) {
+            return 0;
+        } else if (a instanceof NamedFunctionDescriptor) {
+            return 1;
+        } else if (a instanceof ConstructorDescriptor) {
+            return 1;
+        } else {
+            throw new IllegalStateException();
+        }
+    }
 
     public static class OverloadCompatibilityInfo {
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
index 057915d8b2e..3e2b9262e03 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
@@ -99,6 +99,8 @@ public class OverridingUtil {
         if (superDescriptor instanceof PropertyDescriptor) {
             if (subDescriptor instanceof FunctionDescriptor) return OverrideCompatibilityInfo.memberKindMismatch();
         }
+
+        // TODO: check outside of this method
         if (!superDescriptor.getName().equals(subDescriptor.getName())) {
             return OverrideCompatibilityInfo.nameMismatch();
         }
@@ -191,9 +193,11 @@ public class OverridingUtil {
                 JetType subValueParameterType = getUpperBound(subValueParameters.get(i));
                 // TODO: compare erasure
                 if (!JetTypeChecker.INSTANCE.equalTypes(superValueParameterType, subValueParameterType)) {
-                    return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameterType, subValueParameterType, OverrideCompatibilityInfo.ErrorKind.CONFLICT);
+                    return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameterType, subValueParameterType, OverrideCompatibilityInfo.ErrorKind.INCOMPATIBLE);
                 }
             }
+            
+            return OverrideCompatibilityInfo.success();
 
         }
 
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.jet b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.jet
index 1a90a9df0c5..cd4d6ad3fbb 100644
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.jet
+++ b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.jet
@@ -1,4 +1,4 @@
 class Aaa() {
-    val <!REDECLARATION, REDECLARATION!>a<!> = 1
-    val <!REDECLARATION, REDECLARATION!>a<!> = 1
+    val <!REDECLARATION!>a<!> = 1
+    val <!REDECLARATION!>a<!> = 1
 }
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.jet b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.jet
index f813fd25a32..e1abf31236f 100644
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.jet
+++ b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.jet
@@ -1,4 +1,4 @@
 class Aaa() {
-    val <!REDECLARATION, REDECLARATION!>a<!> = 1
-    val <!REDECLARATION, REDECLARATION!>a<!> = ""
+    val <!REDECLARATION!>a<!> = 1
+    val <!REDECLARATION!>a<!> = ""
 }
diff --git a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.jet b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.jet
index f484dc133b3..d2927deec76 100644
--- a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.jet
+++ b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.jet
@@ -1,9 +1,9 @@
 package override.generics
 
 abstract class MyAbstractClass<T> {
-    abstract val <!REDECLARATION!>pr<!> : T
+    abstract val pr : T
 }
 
 abstract class MyLegalAbstractClass2<T>(t : T) : MyAbstractClass<Int>() {
-    <!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
+    <!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
 }
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.jet b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.jet
index b423eb0864f..dd4b57b2031 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.jet
+++ b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.jet
@@ -1,7 +1,7 @@
 open class Aaa() {
-    val <!REDECLARATION!>bar<!> = 1
+    val bar = 1
 }
 
 open class Bbb() : Aaa() {
-    <!CONFLICTING_OVERLOADS!>val <T> <!REDECLARATION!>bar<!> = "aa"<!>
+    <!CONFLICTING_OVERLOADS!>val <T> bar = "aa"<!>
 }
diff --git a/compiler/testData/diagnostics/tests/override/Generics.jet b/compiler/testData/diagnostics/tests/override/Generics.jet
index ec17533dbaf..2b120f0a5ab 100644
--- a/compiler/testData/diagnostics/tests/override/Generics.jet
+++ b/compiler/testData/diagnostics/tests/override/Generics.jet
@@ -6,7 +6,7 @@ trait MyTrait<T> {
 
 abstract class MyAbstractClass<T> {
     abstract fun bar(t: T) : T
-    abstract val <!REDECLARATION, REDECLARATION, REDECLARATION!>pr<!> : T
+    abstract val pr : T
 }
 
 trait MyProps<T> {
@@ -43,7 +43,7 @@ abstract class MyAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
 class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass1<!><T> : MyTrait<T>, MyAbstractClass<T>() {}
 class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalGenericClass2<!><T, R>(r : R) : MyTrait<T>, MyAbstractClass<R>() {
     <!NOTHING_TO_OVERRIDE!>override<!> fun foo(r: R) = r
-    <!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> <!REDECLARATION!>pr<!> : R = r<!>
+    <!CONFLICTING_OVERLOADS!><!NOTHING_TO_OVERRIDE!>override<!> val <T> pr : R = r<!>
 }
 class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass1<!> : MyTrait<Int>, MyAbstractClass<String>() {}
 abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {}
@@ -51,10 +51,10 @@ abstract class MyLegalAbstractClass1 : MyTrait<Int>, MyAbstractClass<String>() {
 class <!ABSTRACT_MEMBER_NOT_IMPLEMENTED!>MyIllegalClass2<!><T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
     fun foo(t: T) = t
     fun bar(t: T) = t
-    <!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
+    <!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
 }
 abstract class MyLegalAbstractClass2<T>(t : T) : MyTrait<Int>, MyAbstractClass<Int>() {
     fun foo(t: T) = t
     fun bar(t: T) = t
-    <!CONFLICTING_OVERLOADS!>val <R> <!REDECLARATION!>pr<!> : T = t<!>
+    <!CONFLICTING_OVERLOADS!>val <R> pr : T = t<!>
 }