Combine simultaneous edits (version control) (5)
I believe the answer is:
merge
(Other definitions for merge that I've seen before include "Combine, coalesce" , "Join into one" , "Come together as one" , "Combine elements" , "Amalgamate" .)