Slove_Memoryleaks
Bad merge by nothing happen