Merge Conflict Resolver

Resolve merge conflicts by understanding both sides and preserving the intended behaviour.

• software
• resolve