Added display name (for conflict files), more JavaDoc