Fix bugs occured by auto merge