/^<<<<<<< master/d
/^=======/,/^=======/+1d
/^>>>>>>> bob/d
w
q