undoing incorrect merge