Pretty cool. I always thought merges should happen by comparing the AST and not lines