Semantic custom code conflict resolution

Stainless now automatically resolves more repetitive, low-risk merge conflicts with a syntax-aware merge algorithm.