1 files changed, 1 insertions, 3 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
index c63bf5d3a7..d774077502 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
@@ -126,7 +126,6 @@ public class Submit implements RestModifyView<RevisionResource, Input> {
         // If the merge was attempted and it failed the system usually
         // writes a comment as a ChangeMessage and sets status to NEW.
         // Find the relevant message and report that as the conflict.
-        final Timestamp before = rsrc.getChange().getLastUpdatedOn();
         ChangeMessage msg = Iterables.getFirst(Iterables.filter(
           Lists.reverse(dbProvider.get().changeMessages()
               .byChange(change.getId())
@@ -134,8 +133,7 @@ public class Submit implements RestModifyView<RevisionResource, Input> {
           new Predicate<ChangeMessage>() {
             @Override
             public boolean apply(ChangeMessage input) {
-              return input.getAuthor() == null
-                  && input.getWrittenOn().getTime() >= before.getTime();
+              return input.getAuthor() == null;
             }
           }), null);
         if (msg != null) {