Yes, that's it! When I was experiencing this, I was working heavily with HTML attributes, particularly adding code like this:
<<AssertionReason.PrimaryReason.Name>> <span style="float: right;"><<IF AssertionReason.PrimaryReason.ID IS DEFINED AND
(AssertionReason.Initiative.Sponsor=LoggedInPerson OR LoggedInPerson.Role.Strategy='Responsible (Full)') THEN SHOW SECTION_START>>
<button class="k-primary aw_custom_form_button" data-ref="<operation name="View Primary Reason" type="start_process" operand="ViewPrimaryReason" parameters="AssertionReason" image_cls="fa fa-edit" display_text="false"> </operation>"> </button> <button class="k-primary aw_custom_form_button" data-ref="<operation name="Clear Primary Reason" type="start_process" operand="ClearReason" parameters="AssertionReason" image_cls="fa fa-unlink" display_text="false"> <description>This will clear the primary reason.</description> </operation>"> </button><<SECTION_END>> <<IF AssertionReason.PrimaryReason.ID IS UNDEFINED AND
(AssertionReason.Initiative.Sponsor=LoggedInPerson OR LoggedInPerson.Role.Strategy='Responsible (Full)') THEN SHOW SECTION_START>>
<button class="k-primary aw_custom_form_button" data-ref="<operation name="Add New Primary Reason" type="start_process" operand="AddReason" parameters="AssertionReason" image_cls="fa fa-plus" display_text="false"> <description>Add New Reason as Primary Reason</description> </operation>"> </button> <button class="k-primary aw_custom_form_button" data-ref="<operation name="Link Existing Reason" type="start_process" operand="ViewRootCauseAnalysis" image_cls="fa fa-link" display_text="false"> <description>Link to Existing Reason as Primary</description> </operation>"> </button>
<<SECTION_END>></span>
I haven't added buttons/sections in a couple weeks. John, did your HTML attribute have buttons and/or SECTION START/END?
Also, when retrieving this code, I encountered that same merge slippage issue (see screenshot).

