add back change lost in merge