Remove git info garbage from bad merge