✏ EDIT: git-merge-ours



[✗] CANCEL
[~] Kerym Chaeceran