Git Conflict Resolver



Resolved Output: