Index: D:/Projects/Subclipse/core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java
===================================================================
--- D:/Projects/Subclipse/core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java	(revision 2142)
+++ D:/Projects/Subclipse/core/src/org/tigris/subversion/subclipse/core/sync/SVNStatusSyncInfo.java	(working copy)
@@ -133,7 +133,8 @@
         			&& (isNotModified(repositoryKind))) return SyncInfo.OUTGOING | SyncInfo.DELETION;
         }
         else if( isChange(localKind) ) {
-            if( isChange( repositoryKind )
+            if( isConflict(localKind)
+             || isChange( repositoryKind )
              || isAddition( repositoryKind ) 
              || isDeletion( repositoryKind ))
                 return SyncInfo.CONFLICTING | SyncInfo.CHANGE;
@@ -187,6 +188,9 @@
     private static boolean isAddition(SVNStatusKind kind) {
         return kind == SVNStatusKind.ADDED || kind == SVNStatusKind.UNVERSIONED;
     }
+    private static boolean isConflict(SVNStatusKind kind) {
+        return kind == SVNStatusKind.CONFLICTED;
+    }
 
     private static IResourceVariant createBaseResourceVariant(IResource local, LocalResourceStatus baseStatusInfo) {
         if( baseStatusInfo == null