String () { if (!isConflict()) return null; List<String> conflicts = asList( myTree ? message("file.conflict.tree") : null, myText ? message("file.conflict.text") : null, myProperty ? message("file.conflict.property") : null ); return join(conflicts, ", "); }