clearing out git conflict cruft