Index: /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java	(revision 4162)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java	(revision 4163)
@@ -15,12 +15,12 @@
     BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217,255,217)),
     BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255,197,197)),
-    BGCOLOR_MINE(marktr("Conflict background: mine"), Color.white),
-    BGCOLOR_THEIR(marktr("Conflict background: their"), new Color(217,255,217)),
+    BGCOLOR_DROP(marktr("Conflict background: drop"), Color.white),
+    BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217,255,217)),
     BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217,255,217)),
     BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143,170,255)),
 
     FGCOLOR_UNDECIDED(marktr("Conflict foreground: undecided"), Color.black),
-    FGCOLOR_MINE(marktr("Conflict foreground: mine"), Color.lightGray),
-    FGCOLOR_THEIR(marktr("Conflict foreground: their"), Color.black),
+    FGCOLOR_DROP(marktr("Conflict foreground: drop"), Color.lightGray),
+    FGCOLOR_KEEP(marktr("Conflict foreground: keep"), Color.black),
 
     BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234,234,234)),
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 4162)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 4163)
@@ -8,16 +8,14 @@
 
 public class MineTableCellRenderer extends TagMergeTableCellRenderer {
-    /* NOTE: mine and their colors are reversed for this renderer */
 
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
-        if (isSelected)  {
+        if (isSelected) {
             setBackground(ConflictColors.BGCOLOR_SELECTED.get());
             return;
         }
-
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setBackground(ConflictColors.BGCOLOR_THEIR.get());
+            setBackground(ConflictColors.BGCOLOR_KEEP.get());
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(ConflictColors.BGCOLOR_MINE.get());
+            setBackground(ConflictColors.BGCOLOR_DROP.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
@@ -27,7 +25,7 @@
     protected void setTextColor(TagMergeItem item) {
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setForeground(ConflictColors.FGCOLOR_THEIR.get());
+            setForeground(ConflictColors.FGCOLOR_KEEP.get());
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setForeground(ConflictColors.FGCOLOR_MINE.get());
+            setForeground(ConflictColors.FGCOLOR_DROP.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());
@@ -37,5 +35,5 @@
     @Override
     protected void renderKey(TagMergeItem item, boolean isSelected) {
-        setBackgroundColor(item,isSelected);
+        setBackgroundColor(item, isSelected);
         setTextColor(item);
         if (item.getMyTagValue() == null) {
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 4162)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 4163)
@@ -15,7 +15,7 @@
         }
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setBackground(ConflictColors.BGCOLOR_MINE.get());
+            setBackground(ConflictColors.BGCOLOR_DROP.get());
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(ConflictColors.BGCOLOR_THEIR.get());
+            setBackground(ConflictColors.BGCOLOR_KEEP.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setBackground(ConflictColors.BGCOLOR_UNDECIDED.get());
@@ -24,8 +24,8 @@
 
     protected void setTextColor(TagMergeItem item) {
-        if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setForeground(ConflictColors.FGCOLOR_THEIR.get());
-        } else if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setForeground(ConflictColors.FGCOLOR_MINE.get());
+        if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
+            setForeground(ConflictColors.FGCOLOR_DROP.get());
+        } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
+            setForeground(ConflictColors.FGCOLOR_KEEP.get());
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setForeground(ConflictColors.FGCOLOR_UNDECIDED.get());