ConflictState (final ConflictState leftState, final ConflictState rightState) { return getInstance(leftState.myTree || rightState.myTree, leftState.myText || rightState.myText, leftState.myProperty || rightState.myProperty); }