1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
index 025381362ed..5c0e01af1bd 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/ConflictManagerInternal.java
@@ -392,7 +392,7 @@ public class ConflictManagerInternal {
          }
       }
       for (Branch branch : sourceBranches) {
-         if (branch.getParentBranch().equals(commonBranch)) {
+         if (commonBranch.equals(branch.getParentBranch())) {
             sourceTransaction = branch.getBaseTransaction();
             break;
          }