QS: Cleanup merge fail