Dear web designers:
大众用增程炮轰自己，如果能换来2000万车主回心转意，继续在增程时代支持大众，那么面子问题也就不那么重要了。
。快连官网对此有专业解读
Git merges by comparing lines. When two branches both add code to the same file — even to completely different functions — Git sees overlapping line ranges and declares a conflict:
effect.send_to_player(0x00000022, 3613, 2585, 0, 0x3728, 10, 10, 0, 0, 5023)
Pokémon FireRed