Someone else edited that page while you were editing it. This leads to an edit conflict which you have to fix by hand.
::other_diff_html::
::our_diff_html::