EDU-1469: Update idempotent publishing section for clarity

Author: franrob-projects

content/channels/index.textile

@@ -755,15 +755,6 @@ h3(#idempotency). Idempotent publish
 
 Idempotent publishing ensures that multiple attempts to publish the same message do not result in duplicate messages. This feature is essential when network issues may cause a client to reattempt message publication without knowing if the initial attempt succeeded.
 
-<<<<<<< HEAD
-It is possible that a client publishing a message using the REST interface may not receive acknowledgement of receipt from Ably, due to issues such as network failure outside of Ably's control. Clients will internally attempt to re-publish messages in these instances.
-
-When idempotent publishing is enabled, the Ably SDK will internally assign a unique ID to each message which ensures that subsequent retry attempts cannot result in duplicate messages. Idempotent publishing is enabled by default in all latest Ably SDKs. It can be disabled by setting the @idempotentRestPublishing@ "@ClientOptions@":/api/rest-sdk#client-options to @false@.
-
-Note that Ably can only detect duplicate messages within a 2-minute window after the original message, with the same ID, is published. If a message with the same ID is published after this 2-minute window, it will be treated as a new message.
-
-You can also specify message IDs externally. The following is an example of how you might do this:
-=======
 h4. Automatic idempotency
 
 For versions 1.2 and later of the Ably library, idempotent publishing is enabled by default. This means the Ably SDK automatically assigns a unique ID to each message to prevent duplicates during retries. This functionality applies to both REST and realtime publishing.
@@ -853,7 +844,6 @@ message := &ably.Message{
   ID:   "unique123",
 }
 ```
->>>>>>> 4bfa4c08 (EDU-1469: Re-writes idempotent publishing section to improve clarity to the reader)
 
 ```[rest_javascript]
   const rest = new Ably.Rest = '{{API_KEY}}';