1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java
index 86dac7bc151..271726644e7 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/conflict/ConflictStatusManager.java
@@ -57,7 +57,8 @@ public class ConflictStatusManager {
          if (chStmt.next()) {
             //There was an entry so lets check it and update it.
             int intStatus = chStmt.getInt("status");
-            if ((chStmt.getInt("source_gamma_id") != sourceGamma || chStmt.getInt("dest_gamma_id") != destGamma) && intStatus != ConflictStatus.COMMITTED.getValue()) {
+            if ((chStmt.getInt("source_gamma_id") != sourceGamma || chStmt.getInt(
+               "dest_gamma_id") != destGamma) && intStatus != ConflictStatus.COMMITTED.getValue()) {
                if (intStatus == ConflictStatus.RESOLVED.getValue() || intStatus == ConflictStatus.PREVIOUS_MERGE_APPLIED_SUCCESS.getValue()) {
                   intStatus = ConflictStatus.OUT_OF_DATE_RESOLVED.getValue();
                }