feat(merge): add conflict_choose_side action to replace merged buffer with one whole side#276
Merged
conflict_choose_side action to replace merged buffer with one whole side#276