Removes code from bad merge