Removed conflict resolution leftover

Author: mnocon

docs/content_management/pages/create_custom_page_block.md

@@ -131,12 +131,6 @@ The following UDW configuration is used so only an `event` typed content item ca
 
 For more information, see [UDW configuration](browser.md#udw-configuration).
 
-Your custom page block is now ready.
-
-!!! caution
-
-    Before you can use it in Page Builder, you must [enable it in Page field settings]([[= user_doc =]]/content_management/configure_ct_field_settings/#block-display).
-
 Your custom page block is now registered in the system.
 
 !!! caution