Thread:Merrystar/@comment-32856297-20170524153643/@comment-11001-20170531045301

If the edit conflict can be resolved the edits will be merged; more commonly the user making the second edit is asked to merge their text onto the changed page before it can be published.