Tidy

proposals/4133-extended-profiles.md

@@ -130,19 +130,13 @@ fields are published over federation, and this proposal continues to allow this
 
 ## Capabilities
 
-<<<<<<< HEAD
-A new capability `m.profile_fields` controls the ability to *set* custom profile fields and is
-advertised on the `GET /_matrix/client/v3/capabilities` endpoint.
+A new capability `m.profile_fields` controls the ability to *set* profile fields and is advertised
+on the `GET /_matrix/client/v3/capabilities` endpoint.
 
 This capability deprecates the use of m.set_displayname and m.set_avatar_url, which are not
 required when this capability is present.
 
 Clients SHOULD check for this capability before attempting to create or modify a profile field.
-=======
-A new capability `m.profile_fields` controls the ability to *set* profile fields and is
-advertised on the `GET /_matrix/client/v3/capabilities` endpoint. Clients SHOULD check for this
-capability before attempting to create or modify a profile field.
->>>>>>> 44515c57bb422f733b894ec1fa8d299bbc074fac
 
 - **Capability Structure**:
 
@@ -256,10 +250,10 @@ with the following considerations:
   convention (e.g., `com.example.custom_field`).
 
 Following this change, for example, clients could use `m.example_field` if that field is defined by
-the Matrix specification, or `org.example.job_title` for organisation, client-specific fields, and 
-MSC-backed unstable features.
-The proposal [MSC4175](https://github.com/matrix-org/matrix-spec-proposals/pull/4175) demonstrates
-the process of defining new fields in the `m.*` namespace.
+the Matrix specification, or `org.example.job_title` for organisation, client-specific fields, and
+MSC-backed unstable features. The proposal
+[MSC4175](https://github.com/matrix-org/matrix-spec-proposals/pull/4175) demonstrates the process
+of defining new fields in the `m.*` namespace.
 
 ## Propagation of Profile Fields to Membership Events