fix missing code is caused by auto merge