Fucking Tortoise git Conflict Resolver