Updated builds comparison after the review

documentation/docs/features.md

@@ -15,6 +15,5 @@ The following table provides features available for each version:
 | | Logical replication of encrypted tables | 
 
 
-<i warning>:material-alert: Warning:</i> Note that introducing encryption/decryption affects performance. Our benchmark tests show less than 10% performance overhead for most situations. However, in some specific applications such as those using JSONB operations, performance degradation might be higher.
 
 [Get started](install.md){.md-button}

documentation/docs/release-notes/release-notes.md

@@ -4,7 +4,6 @@
 
 [Get started](../install.md){.md-button}
 
-<<<<<<< HEAD
 ## Beta 2 (2024-12-16)
 
 With this release, `pg_tde` extension offers two database specific versions:
@@ -24,37 +23,17 @@ The Beta 2 version introduces the following features and improvements:
 
 ### Improvements
 
-=======
-## Beta 2 ()
-
-With this release, `pg_tde` extension offers two database specific builds:
-
-*  The build for PostgreSQL Community provides only the `tde_heap_basic` access method using which youcan introduce table encryption and WAL encryption for data in the encrypted tables. Index data however,remains unencrypted.
-* The build for [Pecrcona Server for PostgreSQL]() provides the `tde_heap_basic` and the `tde_heap`access methods. The latter enables you to encrypt index data in encrypted tables thus increasing the safety of your sensitive data. Note that this is an experimental functionality; therefore, do not use it on production environments.
-
-The Beta 2 version introduces the following features and improvements:
-
-* You can now enable index encryption for encrypted tables and WAL data for both encrypted and unencrypted table using the `tde_heap` access method. To use this access method, you must install Percona Server for PostgreSQL. Note that this is an experimental access method; therefore, do not use it on production environments.
-* Added event triggers to identify index creation operations on encrypted tables and store those in a custom storage
-* Exposed Storage Manager API and added the usage of Initialization vector (IV) in it. 
->>>>>>> Added the list of changes to the release notes
 * WAL encryption improvements:
 
    * Added a global key to encrypt WAL data in global space
    * Added WAL key management
 
-<<<<<<< HEAD
 * Keyring improvements:
 
-=======
-* Keyring improvements include the following:
-
->>>>>>> Added the list of changes to the release notes
     * Renamed functions to point their usage for principal key management
     * Improved keyring provider management across databases and the global space.
     * Keyring configuration now uses common JSON API. This simplifies code handling and enables frontend tools like `pg_waldump` to read the code thus improving debugging.
 
-<<<<<<< HEAD
 * The `pg_tde_is_encrypted` function now supports custom schemas in the format of `pg_tde_is_encrypted('schema.table');`
 * Changed the location of internal TDE files: instead of the database directory, now all files are stored in `$PGDATA/tde`
 * Improved error reporting when `pg_tde` is not added to the `shared_preload_libraries`
@@ -67,8 +46,6 @@ The Beta 2 version introduces the following features and improvements:
 
 * Fixed multiple bugs with `tde_heap_basic` and TOAST records
 * Fixed various memory leaks
-=======
->>>>>>> Added the list of changes to the release notes
 
 ## Beta (2024-06-30)