merge and fix

merge and fix