Revision (@NotNull TreeConflictDescription description) { Revision result = null; if (description.getSourceLeftVersion() != null) { long committed = description.getSourceLeftVersion().getPegRevision(); if (myCommittedRevision != null && myCommittedRevision.getRevision().getNumber() < committed && myCommittedRevision.getRevision().isValid()) { committed = myCommittedRevision.getRevision().getNumber(); } result = Revision.of(committed); } return result; }