merge-resolver

Resolve Git merge conflicts intelligently.