Sd fix merge