Use vimdiff to resolve git conflictions

diffg RE
diffg BA
diffg LO

and the right one in the 3-top windows are the code you had wrote