Added Git Conflict Resolver