Weave: Merging based on language structure and not lines