MergeConflictType (@NotNull MergeConflictType oldConflictType) { Type oldDiffType = oldConflictType.getType(); if (oldDiffType != Type.INSERTED && oldDiffType != Type.DELETED) { return oldConflictType; } return new MergeConflictType(oldDiffType == Type.DELETED ? Type.INSERTED : Type.DELETED, oldConflictType.isChange(Side.LEFT), oldConflictType.isChange(Side.RIGHT), oldConflictType.canBeResolved()); }