Cleanup merge fail