reverse bad merge