/^<<<<<<< master/,/^=======/d
/^>>>>>>> charlie/d
w
q